From 0415a8b4d9749a98b1edd27c20ee2d1699420222 Mon Sep 17 00:00:00 2001
From: jayeshkrishna <jayesh@mcs.anl.gov>
Date: Mon, 4 Nov 2024 17:13:46 -0600
Subject: [PATCH 1/2] Adding PIO_IOTYPE_ADIOSC iotype

Adding a new I/O type, PIO_IOTYPE_ADIOSC, that can be used to
write (and read) data in ADIOS BP file format with compression
---
 src/clib/pio.h                   |  5 ++-
 src/clib/pio_darray.cpp          | 25 +++++------
 src/clib/pio_file.cpp            | 38 ++++++++--------
 src/clib/pio_getput_int.cpp      | 46 ++++++++++----------
 src/clib/pio_nc.cpp              | 74 ++++++++++++++++----------------
 src/clib/pio_print.cpp           |  2 +
 src/clib/pioc.cpp                |  2 +-
 src/clib/pioc_support.cpp        | 24 ++++++-----
 src/flib/pio.F90                 |  2 +-
 src/flib/pio_types.F90           |  8 ++--
 tests/general/util/pio_tutil.F90 | 70 +++++++++++++++++++++++++++++-
 11 files changed, 186 insertions(+), 110 deletions(-)

diff --git a/src/clib/pio.h b/src/clib/pio.h
index 8aca2d6c8..e9f2b3429 100644
--- a/src/clib/pio.h
+++ b/src/clib/pio.h
@@ -1195,8 +1195,11 @@ enum PIO_IOTYPE
     /** ADIOS parallel */
     PIO_IOTYPE_ADIOS = 5,
 
+    /** ADIOS parallel with compression */
+    PIO_IOTYPE_ADIOSC = 6,
+
     /** HDF5 parallel */
-    PIO_IOTYPE_HDF5 = 6
+    PIO_IOTYPE_HDF5 = 7
 };
 
 /**
diff --git a/src/clib/pio_darray.cpp b/src/clib/pio_darray.cpp
index ed9969107..87714275d 100644
--- a/src/clib/pio_darray.cpp
+++ b/src/clib/pio_darray.cpp
@@ -2022,7 +2022,7 @@ int PIOc_write_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen, c
     spio_ltimer_start(ios->io_fstats->wr_timer_name);
     spio_ltimer_start(ios->io_fstats->tot_timer_name);
 
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         GPTLstart("PIO:PIOc_write_darray_adios");
         GPTLstart("PIO:write_total_adios");
@@ -2043,7 +2043,7 @@ int PIOc_write_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen, c
         spio_ltimer_stop(ios->io_fstats->tot_timer_name);
         spio_ltimer_stop(file->io_fstats->wr_timer_name);
         spio_ltimer_stop(file->io_fstats->tot_timer_name);
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
             GPTLstop("PIO:PIOc_write_darray_adios");
             GPTLstop("PIO:write_total_adios");
@@ -2061,7 +2061,7 @@ int PIOc_write_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen, c
         spio_ltimer_stop(ios->io_fstats->tot_timer_name);
         spio_ltimer_stop(file->io_fstats->wr_timer_name);
         spio_ltimer_stop(file->io_fstats->tot_timer_name);
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
             GPTLstop("PIO:PIOc_write_darray_adios");
             GPTLstop("PIO:write_total_adios");
@@ -2082,7 +2082,7 @@ int PIOc_write_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen, c
         spio_ltimer_stop(ios->io_fstats->tot_timer_name);
         spio_ltimer_stop(file->io_fstats->wr_timer_name);
         spio_ltimer_stop(file->io_fstats->tot_timer_name);
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
             GPTLstop("PIO:PIOc_write_darray_adios");
             GPTLstop("PIO:write_total_adios");
@@ -2114,7 +2114,7 @@ int PIOc_write_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen, c
             spio_ltimer_stop(ios->io_fstats->tot_timer_name);
             spio_ltimer_stop(file->io_fstats->wr_timer_name);
             spio_ltimer_stop(file->io_fstats->tot_timer_name);
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:PIOc_write_darray_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -2191,7 +2191,7 @@ if (file->iotype != PIO_IOTYPE_HDF5)
         {
             GPTLstop("PIO:PIOc_write_darray");
             GPTLstop("PIO:write_total");
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:PIOc_write_darray_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -2219,7 +2219,7 @@ if (file->iotype != PIO_IOTYPE_HDF5)
     LOG((3, "wmb->ioid = %d wmb->recordvar = %d", wmb->ioid, wmb->recordvar));
 
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         ierr = PIO_NOERR;
         ierr = PIOc_write_darray_adios(file, varid, ioid, iodesc, arraylen, array, fillvalue);
@@ -3578,7 +3578,7 @@ int PIOc_read_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen,
               "unknown rearranger", __FILE__, __LINE__);
 
     /* Get var description. */
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
 #ifdef _ADIOS2
         vdesc_adios2 = &(file->adios_vars[varid]);
@@ -3597,7 +3597,7 @@ int PIOc_read_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen,
         spio_ltimer_stop(file->io_fstats->tot_timer_name);
 
         /* Find out PIO data type of var. */
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
 #ifdef _ADIOS2
             assert(vdesc_adios2->nc_type != PIO_NAT);
@@ -3620,7 +3620,7 @@ int PIOc_read_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen,
         }
 
         /* Find out length of type. */
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
 #ifdef _ADIOS2
             if (vdesc_adios2->adios_type_size == 0)
@@ -3649,7 +3649,7 @@ int PIOc_read_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen,
         spio_ltimer_start(file->io_fstats->tot_timer_name);
     }
 
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
 #ifdef _ADIOS2
         ios->io_fstats->rb += vdesc_adios2->adios_type_size * iodesc->llen;
@@ -3698,7 +3698,7 @@ int PIOc_read_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen,
    else
        rlen = iodesc->llen;
 
-   if (file->iotype == PIO_IOTYPE_ADIOS)
+   if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
        rlen = 0;
 
     if(!ios->async || !ios->ioproc)
@@ -3822,6 +3822,7 @@ int PIOc_read_darray_impl(int ncid, int varid, int ioid, PIO_Offset arraylen,
             break;
 #ifdef _ADIOS2
         case PIO_IOTYPE_ADIOS:
+        case PIO_IOTYPE_ADIOSC:
             GPTLstart("PIO:PIOc_read_darray_adios");
             if ((ierr = PIOc_read_darray_adios(file, fndims, iodesc, varid, array)))
             {
diff --git a/src/clib/pio_file.cpp b/src/clib/pio_file.cpp
index 011a0e161..11fc44640 100644
--- a/src/clib/pio_file.cpp
+++ b/src/clib/pio_file.cpp
@@ -135,7 +135,7 @@ int PIOc_createfile_impl(int iosysid, int *ncidp, const int *iotype, const char
 
     GPTLstart("PIO:PIOc_createfile");
     GPTLstart("PIO:write_total");
-    if (*iotype == PIO_IOTYPE_ADIOS)
+    if ((*iotype == PIO_IOTYPE_ADIOS) || (*iotype == PIO_IOTYPE_ADIOSC))
     {
         GPTLstart("PIO:PIOc_createfile_adios");
         GPTLstart("PIO:write_total_adios");
@@ -146,7 +146,7 @@ int PIOc_createfile_impl(int iosysid, int *ncidp, const int *iotype, const char
     {
         GPTLstop("PIO:PIOc_createfile");
         GPTLstop("PIO:write_total");
-        if (*iotype == PIO_IOTYPE_ADIOS)
+        if ((*iotype == PIO_IOTYPE_ADIOS) || (*iotype == PIO_IOTYPE_ADIOSC))
         {
             GPTLstop("PIO:PIOc_createfile_adios");
             GPTLstop("PIO:write_total_adios");
@@ -165,7 +165,7 @@ int PIOc_createfile_impl(int iosysid, int *ncidp, const int *iotype, const char
         GPTLstop("PIO:write_total");
         spio_ltimer_stop(ios->io_fstats->wr_timer_name);
         spio_ltimer_stop(ios->io_fstats->tot_timer_name);
-        if (*iotype == PIO_IOTYPE_ADIOS)
+        if ((*iotype == PIO_IOTYPE_ADIOS) || (*iotype == PIO_IOTYPE_ADIOSC))
         {
             GPTLstop("PIO:PIOc_createfile_adios");
             GPTLstop("PIO:write_total_adios");
@@ -188,7 +188,7 @@ int PIOc_createfile_impl(int iosysid, int *ncidp, const int *iotype, const char
         {
             GPTLstop("PIO:PIOc_createfile");
             GPTLstop("PIO:write_total");
-            if (*iotype == PIO_IOTYPE_ADIOS)
+            if ((*iotype == PIO_IOTYPE_ADIOS) || (*iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:PIOc_createfile_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -204,7 +204,7 @@ int PIOc_createfile_impl(int iosysid, int *ncidp, const int *iotype, const char
     GPTLstop("PIO:write_total");
     spio_ltimer_stop(ios->io_fstats->wr_timer_name);
     spio_ltimer_stop(ios->io_fstats->tot_timer_name);
-    if (*iotype == PIO_IOTYPE_ADIOS)
+    if ((*iotype == PIO_IOTYPE_ADIOS) || (*iotype == PIO_IOTYPE_ADIOSC))
     {
         GPTLstop("PIO:PIOc_createfile_adios");
         GPTLstop("PIO:write_total_adios");
@@ -290,7 +290,7 @@ static int sync_file(int ncid)
     spio_ltimer_start(file->io_fstats->tot_timer_name);
 
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (file->mode & PIO_WRITE)
         {
@@ -468,7 +468,7 @@ int PIOc_closefile_impl(int ncid)
     ios = file->iosystem;
     assert(ios);
 
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         GPTLstart("PIO:PIOc_closefile_adios");
 
@@ -499,7 +499,7 @@ int PIOc_closefile_impl(int ncid)
             sync_file(ncid);
         }
 
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
 #ifndef _ADIOS_BP2NC_TEST
         if (file->mode & PIO_WRITE)
@@ -533,7 +533,7 @@ int PIOc_closefile_impl(int ncid)
         PIO_SEND_ASYNC_MSG(ios, msg, &ierr, ncid);
         if(ierr != PIO_NOERR)
         {
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:PIOc_closefile_adios");
 
@@ -572,7 +572,7 @@ int PIOc_closefile_impl(int ncid)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         adios2_error adiosErr = adios2_error_none;
 
@@ -585,7 +585,7 @@ int PIOc_closefile_impl(int ncid)
                 ierr = begin_adios2_step(file, NULL);
                 if (ierr != PIO_NOERR)
                 {
-                    if (file->iotype == PIO_IOTYPE_ADIOS)
+                    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
                     {
                         GPTLstop("PIO:PIOc_closefile_adios");
                         GPTLstop("PIO:write_total_adios");
@@ -619,7 +619,7 @@ int PIOc_closefile_impl(int ncid)
                         attributeH = adios2_define_attribute(file->ioH, "/__pio__/fillmode", adios2_type_int32_t, &file->fillmode);
                         if (attributeH == NULL)
                         {
-                            if (file->iotype == PIO_IOTYPE_ADIOS)
+                            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
                             {
                                 GPTLstop("PIO:PIOc_closefile_adios");
                                 GPTLstop("PIO:write_total_adios");
@@ -680,7 +680,7 @@ int PIOc_closefile_impl(int ncid)
                 GPTLstop("end_adios2_step_PIOc_closefile");
                 if (ierr != PIO_NOERR)
                 {
-                    if (file->iotype == PIO_IOTYPE_ADIOS)
+                    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
                     {
                         GPTLstop("PIO:PIOc_closefile_adios");
                         GPTLstop("PIO:write_total_adios");
@@ -709,7 +709,7 @@ int PIOc_closefile_impl(int ncid)
                 adiosErr = adios2_close(file->engineH);
                 if (adiosErr != adios2_error_none)
                 {
-                    if (file->iotype == PIO_IOTYPE_ADIOS)
+                    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
                     {
                         GPTLstop("PIO:PIOc_closefile_adios");
                         GPTLstop("PIO:write_total_adios");
@@ -911,7 +911,7 @@ int PIOc_closefile_impl(int ncid)
             LOG((1, "DONE CONVERTING: %s", file->filename));
             if (ierr != PIO_NOERR)
             {
-                if (file->iotype == PIO_IOTYPE_ADIOS)
+                if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
                 {
                     GPTLstop("PIO:PIOc_closefile_adios");
                     GPTLstop("PIO:write_total_adios");
@@ -941,7 +941,7 @@ int PIOc_closefile_impl(int ncid)
             file->filename = NULL;
         }
 
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
             GPTLstop("PIO:PIOc_closefile_adios");
 
@@ -983,7 +983,7 @@ int PIOc_closefile_impl(int ncid)
     }
 #endif
 
-    assert(file->iotype != PIO_IOTYPE_ADIOS);
+    assert((file->iotype != PIO_IOTYPE_ADIOS) && (file->iotype != PIO_IOTYPE_ADIOSC));
 
     /* If this is an IO task, then call the netCDF function. */
     if (ios->ioproc)
@@ -1239,7 +1239,7 @@ int PIOc_sync_impl(int ncid)
     if (file->mode & PIO_WRITE)
     {
         GPTLstart("PIO:write_total");
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             GPTLstart("PIO:write_total_adios");
     }
 
@@ -1248,7 +1248,7 @@ int PIOc_sync_impl(int ncid)
     if (file->mode & PIO_WRITE)
     {
         GPTLstop("PIO:write_total");
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             GPTLstop("PIO:write_total_adios");
     }
 
diff --git a/src/clib/pio_getput_int.cpp b/src/clib/pio_getput_int.cpp
index 75eb2945f..905bae9e2 100644
--- a/src/clib/pio_getput_int.cpp
+++ b/src/clib/pio_getput_int.cpp
@@ -60,7 +60,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
     spio_ltimer_start(ios->io_fstats->wr_timer_name);
     spio_ltimer_start(ios->io_fstats->tot_timer_name);
 
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         GPTLstart("PIO:spio_put_att_tc_adios");
         GPTLstart("PIO:write_total_adios");
@@ -75,7 +75,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
         spio_ltimer_stop(ios->io_fstats->tot_timer_name);
         spio_ltimer_stop(file->io_fstats->wr_timer_name);
         spio_ltimer_stop(file->io_fstats->tot_timer_name);
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
             GPTLstop("PIO:spio_put_att_tc_adios");
             GPTLstop("PIO:write_total_adios");
@@ -101,7 +101,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
             LOG((1, "PIOc_inq_type failed, ierr = %d", ierr));
             GPTLstop("PIO:spio_put_att_tc");
             GPTLstop("PIO:write_total");
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_att_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -118,7 +118,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
             if(ierr != PIO_NOERR){
                 GPTLstop("PIO:spio_put_att_tc");
                 GPTLstop("PIO:write_total");
-                if (file->iotype == PIO_IOTYPE_ADIOS)
+                if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
                 {
                     GPTLstop("PIO:spio_put_att_tc_adios");
                     GPTLstop("PIO:write_total_adios");
@@ -151,7 +151,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
             spio_ltimer_stop(ios->io_fstats->tot_timer_name);
             spio_ltimer_stop(file->io_fstats->wr_timer_name);
             spio_ltimer_stop(file->io_fstats->tot_timer_name);
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_att_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -169,7 +169,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
             spio_ltimer_stop(ios->io_fstats->tot_timer_name);
             spio_ltimer_stop(file->io_fstats->wr_timer_name);
             spio_ltimer_stop(file->io_fstats->tot_timer_name);
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_att_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -184,7 +184,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
             spio_ltimer_stop(ios->io_fstats->tot_timer_name);
             spio_ltimer_stop(file->io_fstats->wr_timer_name);
             spio_ltimer_stop(file->io_fstats->tot_timer_name);
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_att_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -197,7 +197,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS define attribute %s, varid %d, type %d", name, varid, atttype));
 
@@ -453,7 +453,7 @@ int spio_put_att_tc(int ncid, int varid, const char *name, nc_type atttype,
     }
 #endif /* _HDF5 */
 
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
         {
             if (ios->iomaster == MPI_ROOT)
             {
@@ -703,7 +703,7 @@ int spio_get_att_tc(int ncid, int varid, const char *name, nc_type memtype, void
     file->io_fstats->rb += attlen * atttype_len;
 
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         char *full_name = NULL;
         int full_name_len = 0;
@@ -874,7 +874,7 @@ int spio_get_att_tc(int ncid, int varid, const char *name, nc_type memtype, void
         }
 #endif /* _PNETCDF */
 
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
         {
             switch(memtype)
             {
@@ -1366,7 +1366,7 @@ int spio_get_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
         }
 #endif /* _PNETCDF */
 
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             switch(xtype)
             {
 #ifdef _NETCDF
@@ -1436,7 +1436,7 @@ int spio_get_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
     }
 
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (varid < 0 || varid >= file->num_vars)
         {
@@ -2463,7 +2463,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
     spio_ltimer_start(ios->io_fstats->wr_timer_name);
     spio_ltimer_start(ios->io_fstats->tot_timer_name);
 
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         GPTLstart("PIO:spio_put_vars_tc_adios");
         GPTLstart("PIO:write_total_adios");
@@ -2478,7 +2478,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
         spio_ltimer_stop(ios->io_fstats->tot_timer_name);
         spio_ltimer_stop(file->io_fstats->wr_timer_name);
         spio_ltimer_stop(file->io_fstats->tot_timer_name);
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
             GPTLstop("PIO:spio_put_vars_tc_adios");
             GPTLstop("PIO:write_total_adios");
@@ -2500,7 +2500,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
         if(ierr != PIO_NOERR){
             GPTLstop("PIO:spio_put_vars_tc");
             GPTLstop("PIO:write_total");
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_vars_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -2518,7 +2518,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
         if(ierr != PIO_NOERR){
             GPTLstop("PIO:spio_put_vars_tc");
             GPTLstop("PIO:write_total");
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_vars_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -2536,7 +2536,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
             if(ierr != PIO_NOERR){
                 GPTLstop("PIO:spio_put_vars_tc");
                 GPTLstop("PIO:write_total");
-                if (file->iotype == PIO_IOTYPE_ADIOS)
+                if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
                 {
                     GPTLstop("PIO:spio_put_vars_tc_adios");
                     GPTLstop("PIO:write_total_adios");
@@ -2598,7 +2598,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
             spio_ltimer_stop(ios->io_fstats->tot_timer_name);
             spio_ltimer_stop(file->io_fstats->wr_timer_name);
             spio_ltimer_stop(file->io_fstats->tot_timer_name);
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_vars_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -2630,7 +2630,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
             spio_ltimer_stop(ios->io_fstats->tot_timer_name);
             spio_ltimer_stop(file->io_fstats->wr_timer_name);
             spio_ltimer_stop(file->io_fstats->tot_timer_name);
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_vars_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -2645,7 +2645,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
             spio_ltimer_stop(ios->io_fstats->tot_timer_name);
             spio_ltimer_stop(file->io_fstats->wr_timer_name);
             spio_ltimer_stop(file->io_fstats->tot_timer_name);
-            if (file->iotype == PIO_IOTYPE_ADIOS)
+            if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
             {
                 GPTLstop("PIO:spio_put_vars_tc_adios");
                 GPTLstop("PIO:write_total_adios");
@@ -2657,7 +2657,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (varid < 0 || varid >= file->num_vars)
         {
@@ -3346,7 +3346,7 @@ int spio_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Off
     }
 #endif /* _HDF5 */
 
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
         {
             LOG((2, "spio_put_vars_tc calling netcdf function file->iotype = %d",
                  file->iotype));
diff --git a/src/clib/pio_nc.cpp b/src/clib/pio_nc.cpp
index ebf9614b2..aa0c8fe7b 100644
--- a/src/clib/pio_nc.cpp
+++ b/src/clib/pio_nc.cpp
@@ -127,7 +127,7 @@ int PIOc_inq_impl(int ncid, int *ndimsp, int *nvarsp, int *ngattsp, int *unlimdi
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (ndimsp)
             *ndimsp = file->num_dim_vars;
@@ -223,7 +223,7 @@ int PIOc_inq_impl(int ncid, int *ndimsp, int *nvarsp, int *ngattsp, int *unlimdi
                 LOG((2, "classic unlimdimid = %d", *unlimdimidp));
         }
 #ifdef _NETCDF4
-        else if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        else if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
         {
             LOG((2, "PIOc_inq calling netcdf-4 nc_inq"));
             ierr = nc_inq(file->fh, ndimsp, nvarsp, ngattsp, unlimdimidp);
@@ -461,7 +461,7 @@ int PIOc_inq_unlimdims_impl(int ncid, int *nunlimdimsp, int *unlimdimidsp)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS missing %s:%s", __FILE__, __func__));
         ierr = PIO_NOERR;
@@ -587,7 +587,7 @@ int PIOc_inq_type_impl(int ncid, nc_type xtype, char *name, PIO_Offset *sizep)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (sizep)
         {
@@ -623,7 +623,7 @@ int PIOc_inq_type_impl(int ncid, nc_type xtype, char *name, PIO_Offset *sizep)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_inq_type(file->fh, xtype, name, (size_t *)sizep);
 #endif /* _NETCDF */
         LOG((2, "PIOc_inq_type netcdf call returned %d", ierr));
@@ -719,7 +719,7 @@ int PIOc_inq_format_impl(int ncid, int *formatp)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         *formatp = 1;
         spio_ltimer_stop(ios->io_fstats->tot_timer_name);
@@ -737,7 +737,7 @@ int PIOc_inq_format_impl(int ncid, int *formatp)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_inq_format(file->fh, formatp);
 #endif /* _NETCDF */
         LOG((2, "PIOc_inq netcdf call returned %d", ierr));
@@ -822,7 +822,7 @@ int PIOc_inq_dim_impl(int ncid, int dimid, char *name, PIO_Offset *lenp)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (0 <= dimid && dimid < file->num_dim_vars)
         {
@@ -911,7 +911,7 @@ int PIOc_inq_dim_impl(int ncid, int dimid, char *name, PIO_Offset *lenp)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
         {
             LOG((2, "calling nc_inq_dim"));
             ierr = nc_inq_dim(file->fh, dimid, name, (size_t *)lenp);;
@@ -1072,7 +1072,7 @@ int PIOc_inq_dimid_impl(int ncid, const char *name, int *idp)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         ierr = PIO_EBADDIM;
         for (int i = 0; i < file->num_dim_vars; i++)
@@ -1148,7 +1148,7 @@ int PIOc_inq_dimid_impl(int ncid, const char *name, int *idp)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_inq_dimid(file->fh, name, idp);
 #endif /* _NETCDF */
     }
@@ -1251,7 +1251,7 @@ int PIOc_inq_var_impl(int ncid, int varid, char *name, int namelen, nc_type *xty
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (varid < file->num_vars)
         {
@@ -1376,7 +1376,7 @@ int PIOc_inq_var_impl(int ncid, int varid, char *name, int namelen, nc_type *xty
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
         {
             ndims = file->varlist[varid].ndims;
             if(ndims <= 0){
@@ -1726,7 +1726,7 @@ int PIOc_inq_varid_impl(int ncid, const char *name, int *varidp)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         ierr = PIO_ENOTVAR;
         for (int i = 0; i < file->num_vars; i++)
@@ -1790,7 +1790,7 @@ int PIOc_inq_varid_impl(int ncid, const char *name, int *varidp)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_inq_varid(file->fh, name, varidp);
 #endif /* _NETCDF */
     }
@@ -1945,7 +1945,7 @@ int PIOc_inq_att_impl(int ncid, int varid, const char *name, nc_type *xtypep,
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         /* Track attributes */
         ierr = PIO_ENOTATT;
@@ -2026,7 +2026,7 @@ int PIOc_inq_att_impl(int ncid, int varid, const char *name, nc_type *xtypep,
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_inq_att(file->fh, varid, name, xtypep, (size_t *)lenp);
 #endif /* _NETCDF */
         LOG((2, "PIOc_inq netcdf call returned %d", ierr));
@@ -2158,7 +2158,7 @@ int PIOc_inq_attname_impl(int ncid, int varid, int attnum, char *name)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (0 <= attnum && attnum < file->num_attrs &&
             file->adios_attrs[attnum].att_varid == varid &&
@@ -2236,7 +2236,7 @@ int PIOc_inq_attname_impl(int ncid, int varid, int attnum, char *name)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_inq_attname(file->fh, varid, attnum, name);
 #endif /* _NETCDF */
         LOG((2, "PIOc_inq_attname netcdf call returned %d", ierr));
@@ -2344,7 +2344,7 @@ int PIOc_inq_attid_impl(int ncid, int varid, const char *name, int *idp)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         ierr = PIO_ENOTATT;
         for (int i = 0; i < file->num_attrs; i++)
@@ -2412,7 +2412,7 @@ int PIOc_inq_attid_impl(int ncid, int varid, const char *name, int *idp)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_inq_attid(file->fh, varid, name, idp);
 #endif /* _NETCDF */
         LOG((2, "PIOc_inq_attname netcdf call returned %d", ierr));
@@ -2512,7 +2512,7 @@ int PIOc_rename_dim_impl(int ncid, int dimid, const char *name)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS missing %s:%s", __FILE__, __func__));
         ierr = PIO_NOERR;
@@ -2528,7 +2528,7 @@ int PIOc_rename_dim_impl(int ncid, int dimid, const char *name)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_rename_dim(file->fh, dimid, name);
 #endif /* _NETCDF */
         LOG((2, "PIOc_inq netcdf call returned %d", ierr));
@@ -2613,7 +2613,7 @@ int PIOc_rename_var_impl(int ncid, int varid, const char *name)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS missing %s:%s", __FILE__, __func__));
         ierr = PIO_NOERR;
@@ -2629,7 +2629,7 @@ int PIOc_rename_var_impl(int ncid, int varid, const char *name)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_rename_var(file->fh, varid, name);
 #endif /* _NETCDF */
         LOG((2, "PIOc_inq netcdf call returned %d", ierr));
@@ -2724,7 +2724,7 @@ int PIOc_rename_att_impl(int ncid, int varid, const char *name,
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS missing %s:%s", __FILE__, __func__));
         ierr = PIO_NOERR;
@@ -2740,7 +2740,7 @@ int PIOc_rename_att_impl(int ncid, int varid, const char *name,
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_rename_att(file->fh, varid, name, newname);
 #endif /* _NETCDF */
     }
@@ -2826,7 +2826,7 @@ int PIOc_del_att_impl(int ncid, int varid, const char *name)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS missing %s:%s", __FILE__, __func__));
         ierr = PIO_NOERR;
@@ -2842,7 +2842,7 @@ int PIOc_del_att_impl(int ncid, int varid, const char *name)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->do_io)
             ierr = nc_del_att(file->fh, varid, name);
 #endif /* _NETCDF */
     }
@@ -2915,7 +2915,7 @@ int PIOc_set_fill_impl(int ncid, int fillmode, int *old_modep)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (old_modep)
             *old_modep = file->fillmode;
@@ -2950,7 +2950,7 @@ int PIOc_set_fill_impl(int ncid, int fillmode, int *old_modep)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
             ierr = nc_set_fill(file->fh, fillmode, old_modep);
 #endif /* _NETCDF */
     }
@@ -3092,7 +3092,7 @@ int PIOc_def_dim_impl(int ncid, const char *name, PIO_Offset len, int *idp)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS define dimension %s with size %llu, id = %d",
                 name, (unsigned long long)len, file->num_dim_vars));
@@ -3212,7 +3212,7 @@ int PIOc_def_dim_impl(int ncid, const char *name, PIO_Offset len, int *idp)
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
             ierr = nc_def_dim(file->fh, name, (size_t)len, idp);
 #endif /* _NETCDF */
     }
@@ -3376,7 +3376,7 @@ int PIOc_def_var_impl(int ncid, const char *name, nc_type xtype, int ndims,
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS pre-define variable %s (%d dimensions, type %d)", name, ndims, xtype));
 
@@ -3617,7 +3617,7 @@ int PIOc_def_var_impl(int ncid, const char *name, nc_type xtype, int ndims,
 #endif /* _PNETCDF */
 
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
         {
             ierr = nc_def_var(file->fh, name, xtype, ndims, dimidsp, varidp);
             if (ierr != PIO_NOERR)
@@ -3923,7 +3923,7 @@ int PIOc_def_var_fill_impl(int ncid, int varid, int fill_mode, const void *fill_
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS missing %s:%s", __FILE__, __func__));
         ierr = PIO_NOERR;
@@ -4120,7 +4120,7 @@ int PIOc_inq_var_fill_impl(int ncid, int varid, int *no_fill, void *fill_valuep)
 
     /* ADIOS: assume all procs are also IO tasks */
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "ADIOS missing %s:%s", __FILE__, __func__));
         ierr = PIO_NOERR;
diff --git a/src/clib/pio_print.cpp b/src/clib/pio_print.cpp
index 7414651a1..ba862903b 100644
--- a/src/clib/pio_print.cpp
+++ b/src/clib/pio_print.cpp
@@ -15,6 +15,8 @@ const char *pio_iotype_to_string(int iotype)
                               return "PIO_IOTYPE_NETCDF4P";
     case PIO_IOTYPE_ADIOS:
                               return "PIO_IOTYPE_ADIOS";
+    case PIO_IOTYPE_ADIOSC:
+                              return "PIO_IOTYPE_ADIOSC";
     default:
                               return "UNKNOWN";
   }
diff --git a/src/clib/pioc.cpp b/src/clib/pioc.cpp
index 0070dd36a..a2e0e09b5 100644
--- a/src/clib/pioc.cpp
+++ b/src/clib/pioc.cpp
@@ -272,7 +272,7 @@ int PIOc_setframe_impl(int ncid, int varid, int frame)
 
 #ifdef _ADIOS2
     /* Add end_step here. Check for frame value of the ncid. */
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         GPTLstart("PIOc_setframe_adios2");
         if (file->adios_io_process == 1)
diff --git a/src/clib/pioc_support.cpp b/src/clib/pioc_support.cpp
index 3ace695f0..5f89b454b 100644
--- a/src/clib/pioc_support.cpp
+++ b/src/clib/pioc_support.cpp
@@ -552,8 +552,7 @@ adios2_variable* spio_define_adios2_variable(iosystem_desc_t *ios, file_desc_t *
 #ifdef _SPIO_ADIOS_USE_COMPRESSION
     assert(ios != NULL && file != NULL);
     /* Skip compression for scalar variables (ndims == 0), see https://github.com/ornladios/ADIOS2/issues/4390 */
-    /* FIXME: Consider adding a new IO type, PIO_IOTYPE_ADIOSC, and use it as a condition for applying compression */
-    if (variable != NULL && ios->compression_operator != NULL && ndims > 0 /* && file->iotype == PIO_IOTYPE_ADIOSC */)
+    if (variable != NULL && ios->compression_operator != NULL && ndims > 0 && (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         size_t operation_index = 0;
         adios2_error adiosErr = adios2_error_none;
@@ -2787,7 +2786,9 @@ int PIO_get_avail_iotypes(char *buf, size_t sz)
 
 #ifdef _ADIOS2
     assert(sz > 0);
-    snprintf(cbuf, sz, ", %s (%d)", pio_iotype_to_string(PIO_IOTYPE_ADIOS), PIO_IOTYPE_ADIOS);
+    snprintf(cbuf, sz, ", %s (%d), %s (%d)",
+              pio_iotype_to_string(PIO_IOTYPE_ADIOS), PIO_IOTYPE_ADIOS,
+              pio_iotype_to_string(PIO_IOTYPE_ADIOSC), PIO_IOTYPE_ADIOSC);
     sz = max_sz - strlen(buf);
     cbuf = buf + strlen(buf);
 #endif
@@ -2998,7 +2999,7 @@ int spio_createfile_int(int iosysid, int *ncidp, const int *iotype, const char *
         return check_mpi(ios, file, mpierr, __FILE__, __LINE__);
     }
 
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         LOG((2, "Calling adios_open mode = %d", file->mode));
 
@@ -3497,7 +3498,7 @@ int spio_createfile_int(int iosysid, int *ncidp, const int *iotype, const char *
     if ((mpierr = MPI_Bcast(&file->mode, 1, MPI_INT, ios->ioroot, ios->union_comm)))
     {
 #ifdef _ADIOS2
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
             if (file->filename != NULL)
             {
@@ -3518,7 +3519,7 @@ int spio_createfile_int(int iosysid, int *ncidp, const int *iotype, const char *
     if (ierr != PIO_NOERR)
     {
 #ifdef _ADIOS2
-        if (file->iotype == PIO_IOTYPE_ADIOS)
+        if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
         {
             if (file->filename != NULL)
             {
@@ -4522,7 +4523,7 @@ int PIOc_openfile_retry_impl(int iosysid, int *ncidp, int *iotype, const char *f
 
     file->iotype = *iotype;
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         if (file->mode & PIO_WRITE)
         {
@@ -4756,7 +4757,7 @@ int PIOc_openfile_retry_impl(int iosysid, int *ncidp, int *iotype, const char *f
     }
 
 #ifdef _ADIOS2
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
         /* Get available variables and set structures. Restrict to the first step only */
         adios2_step_status status;
@@ -5081,6 +5082,7 @@ int PIOc_openfile_retry_impl(int iosysid, int *ncidp, int *iotype, const char *f
 #endif
 #ifdef _ADIOS2
         case PIO_IOTYPE_ADIOS:
+        case PIO_IOTYPE_ADIOSC:
             break; /* This case has been handled above */
 #endif
         default:
@@ -5228,7 +5230,7 @@ int PIOc_openfile_retry_impl(int iosysid, int *ncidp, int *iotype, const char *f
          filename, file->pio_ncid, file->fh, ierr));
 
     /* Set ncid to ADIOS attributes */
-    if (file->iotype == PIO_IOTYPE_ADIOS)
+    if ((file->iotype == PIO_IOTYPE_ADIOS) || (file->iotype == PIO_IOTYPE_ADIOSC))
     {
 #ifdef _ADIOS2
         for (int i = 0; i < file->num_attrs; i++)
@@ -5490,7 +5492,7 @@ int spio_change_def(int ncid, int is_enddef)
         }
 #endif /* _PNETCDF */
 #ifdef _NETCDF
-        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
+        if (file->iotype != PIO_IOTYPE_PNETCDF && file->iotype != PIO_IOTYPE_ADIOS && file->iotype != PIO_IOTYPE_ADIOSC && file->iotype != PIO_IOTYPE_HDF5 && file->do_io)
         {
             if (is_enddef)
             {
@@ -5591,7 +5593,7 @@ int iotype_is_valid(int iotype)
 #endif /* _PNETCDF */
 
 #ifdef _ADIOS2
-    if (iotype == PIO_IOTYPE_ADIOS)
+    if ((iotype == PIO_IOTYPE_ADIOS) || (iotype == PIO_IOTYPE_ADIOSC))
         ret++;
 #endif
 
diff --git a/src/flib/pio.F90 b/src/flib/pio.F90
index d4f60b309..9e5f40d96 100644
--- a/src/flib/pio.F90
+++ b/src/flib/pio.F90
@@ -29,7 +29,7 @@ module pio
        pio_rearr_comm_p2p, pio_rearr_comm_coll,&
        pio_int, pio_real, pio_double, pio_noerr, iotype_netcdf, &
        iotype_pnetcdf,  pio_iotype_netcdf4p, pio_iotype_netcdf4c, &
-       pio_iotype_pnetcdf,pio_iotype_netcdf, pio_iotype_adios, pio_iotype_hdf5, &
+       pio_iotype_pnetcdf,pio_iotype_netcdf, pio_iotype_adios, pio_iotype_adiosc, pio_iotype_hdf5, &
        pio_global, pio_char, pio_write, pio_nowrite, pio_clobber, pio_noclobber, &
        pio_max_name, pio_max_var_dims, pio_rearr_subset, pio_rearr_box, pio_rearr_any,&
 #if defined(_NETCDF) || defined(_PNETCDF)
diff --git a/src/flib/pio_types.F90 b/src/flib/pio_types.F90
index 1fd08fa5d..271233e07 100644
--- a/src/flib/pio_types.F90
+++ b/src/flib/pio_types.F90
@@ -117,7 +117,8 @@ module pio_types
 !!   - PIO_iotype_netcdf : serial (only the root I/O process) read/write using the NetCDF library
 !!   - PIO_iotype_netcdf4c : parallel read/serial write of NetCDF4 (HDF5) files with data compression
 !!   - PIO_iotype_netcdf4p : parallel read/write of NETCDF4 (HDF5) files
-!!   - PIO_iotype_adios : parallel write of ADIOS files with subset rearrangement only
+!!   - PIO_iotype_adios : parallel read/write of ADIOS files
+!!   - PIO_iotype_adiosc : parallel read/write of ADIOS files with data compression
 !!   - PIO_iotype_hdf5 : parallel write of HDF5 files
 !>
     integer(i4), public, parameter ::  &
@@ -125,8 +126,9 @@ module pio_types
         PIO_iotype_netcdf  = 2, &   ! serial read/write of NetCDF file using 'base_node'
         PIO_iotype_netcdf4c = 3, &  ! netcdf4 (hdf5 format) file opened for compression (serial write access only)
         PIO_iotype_netcdf4p = 4, &  ! netcdf4 (hdf5 format) file opened in parallel (all netcdf4 files for read will be opened this way)
-        PIO_iotype_adios = 5, &     ! parallel write of ADIOS files (Write only, rearr subset only)
-        PIO_iotype_hdf5 = 6         ! parallel write of HDF5 files
+        PIO_iotype_adios = 5, &     ! parallel read/write of ADIOS files
+        PIO_iotype_adiosc = 6, &    ! parallel read/write of ADIOS files with compression
+        PIO_iotype_hdf5 = 7         ! parallel write of HDF5 files
 
 
 ! These are for backward compatability and should not be used or expanded upon
diff --git a/tests/general/util/pio_tutil.F90 b/tests/general/util/pio_tutil.F90
index 3730d38c7..84b759175 100644
--- a/tests/general/util/pio_tutil.F90
+++ b/tests/general/util/pio_tutil.F90
@@ -334,6 +334,11 @@ SUBROUTINE PIO_TF_Get_nc_iotypes(iotypes, iotype_descs, num_iotypes)
 #ifdef _ADIOS2
       ! adios
       num_iotypes = num_iotypes + 1
+#ifdef _SPIO_ADIOS_USE_COMPRESSION
+      ! adiosc
+      num_iotypes = num_iotypes + 1
+#endif
+
 #endif
 #ifdef _HDF5
       ! hdf5
@@ -351,12 +356,20 @@ SUBROUTINE PIO_TF_Get_nc_iotypes(iotypes, iotype_descs, num_iotypes)
       iotype_descs(i) = "PNETCDF"
       i = i + 1
 #endif
+
 #ifdef _ADIOS2
       ! adios
       iotypes(i) = PIO_iotype_adios
       iotype_descs(i) = "ADIOS"
       i = i + 1
+#ifdef _SPIO_ADIOS_USE_COMPRESSION
+      ! adiosc
+      iotypes(i) = PIO_iotype_adiosc
+      iotype_descs(i) = "ADIOSC"
+      i = i + 1
 #endif
+#endif
+
 #ifdef _HDF5
       ! hdf5
       iotypes(i) = PIO_iotype_hdf5
@@ -448,10 +461,17 @@ SUBROUTINE PIO_TF_Get_undef_nc_iotypes(iotypes, iotype_descs, num_iotypes)
       ! pnetcdf
       num_iotypes = num_iotypes + 1
 #endif
+
 #ifndef _ADIOS2
-      ! adios
+      ! adios, adiosc
+      num_iotypes = num_iotypes + 2
+#else
+#ifndef _SPIO_ADIOS_USE_COMPRESSION
+      ! adiosc
       num_iotypes = num_iotypes + 1
 #endif
+#endif
+
 #ifndef _HDF5
       ! hdf5
       num_iotypes = num_iotypes + 1
@@ -483,12 +503,25 @@ SUBROUTINE PIO_TF_Get_undef_nc_iotypes(iotypes, iotype_descs, num_iotypes)
       iotype_descs(i) = "PNETCDF"
       i = i + 1
 #endif
+
 #ifndef _ADIOS2
       ! adios
       iotypes(i) = PIO_iotype_adios
       iotype_descs(i) = "ADIOS"
       i = i + 1
+      ! adiosc
+      iotypes(i) = PIO_iotype_adiosc
+      iotype_descs(i) = "ADIOSC"
+      i = i + 1
+#else
+#ifndef _SPIO_ADIOS_USE_COMPRESSION
+      ! adiosc
+      iotypes(i) = PIO_iotype_adiosc
+      iotype_descs(i) = "ADIOSC"
+      i = i + 1
 #endif
+#endif
+
 #ifndef _HDF5
       ! hdf5
       iotypes(i) = PIO_iotype_hdf5
@@ -527,6 +560,10 @@ SUBROUTINE PIO_TF_Get_iotypes(iotypes, iotype_descs, num_iotypes)
 #ifdef _ADIOS2
       ! adios
       num_iotypes = num_iotypes + 1
+#ifdef _SPIO_ADIOS_USE_COMPRESSION
+      ! adiosc
+      num_iotypes = num_iotypes + 1
+#endif
 #endif
 #ifdef _HDF5
       ! hdf5
@@ -549,6 +586,12 @@ SUBROUTINE PIO_TF_Get_iotypes(iotypes, iotype_descs, num_iotypes)
       iotypes(i) = PIO_iotype_adios
       iotype_descs(i) = "ADIOS"
       i = i + 1
+#ifdef _SPIO_ADIOS_USE_COMPRESSION
+      ! adiosc
+      iotypes(i) = PIO_iotype_adiosc
+      iotype_descs(i) = "ADIOSC"
+      i = i + 1
+#endif
 #endif
 #ifdef _HDF5
       ! hdf5
@@ -606,9 +649,14 @@ SUBROUTINE PIO_TF_Get_undef_iotypes(iotypes, iotype_descs, num_iotypes)
       num_iotypes = num_iotypes + 1
 #endif
 #ifndef _ADIOS2
-      ! adios
+      ! adios, adiosc
+      num_iotypes = num_iotypes + 2
+#else
+#ifndef _SPIO_ADIOS_USE_COMPRESSION
+      ! adiosc
       num_iotypes = num_iotypes + 1
 #endif
+#endif
 #ifndef _HDF5
       ! hdf5
       num_iotypes = num_iotypes + 1
@@ -619,12 +667,25 @@ SUBROUTINE PIO_TF_Get_undef_iotypes(iotypes, iotype_descs, num_iotypes)
     ALLOCATE(iotype_descs(num_iotypes))
 
     i = 1
+
 #ifndef _ADIOS2
       ! adios
       iotypes(i) = PIO_iotype_adios
       iotype_descs(i) = "ADIOS"
       i = i + 1
+      ! adiosc
+      iotypes(i) = PIO_iotype_adiosc
+      iotype_descs(i) = "ADIOSC"
+      i = i + 1
+#else
+#ifndef _SPIO_ADIOS_USE_COMPRESSION
+      ! adiosc
+      iotypes(i) = PIO_iotype_adiosc
+      iotype_descs(i) = "ADIOSC"
+      i = i + 1
 #endif
+#endif
+
 #ifndef _HDF5
       ! adios
       iotypes(i) = PIO_iotype_hdf5
@@ -1299,6 +1360,11 @@ INTEGER FUNCTION PIO_TF_Iotype_from_str(iotype_str)
         (str == "adios") .OR.&
         (str == "ADIOS")) THEN
       PIO_TF_Iotype_from_str = PIO_IOTYPE_ADIOS
+    ELSE IF((str == "PIO_IOTYPE_ADIOSC") .OR.&
+        (str == "pio_iotype_adiosc") .OR.&
+        (str == "adiosc") .OR.&
+        (str == "ADIOSC")) THEN
+      PIO_TF_Iotype_from_str = PIO_IOTYPE_ADIOSC
     ELSE IF((str == "PIO_IOTYPE_HDF5") .OR.&
         (str == "pio_iotype_hdf5") .OR.&
         (str == "hdf5") .OR.&

From 1dab253b8ff97d0df3ce6312e48bc93e4486fbdc Mon Sep 17 00:00:00 2001
From: jayeshkrishna <jayesh@mcs.anl.gov>
Date: Thu, 7 Nov 2024 09:33:03 -0600
Subject: [PATCH 2/2] Adding PIO_IOTYPE_ADIOSC to legacy fort interface

Adding the new I/O type, PIO_IOTYPE_ADIOSC, that supports ADIOS
output with data compression in the legacy Fortran interface
---
 src/flib_legacy/pio.F90       | 2 +-
 src/flib_legacy/pio_types.F90 | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/flib_legacy/pio.F90 b/src/flib_legacy/pio.F90
index 872bb63ea..79f40f4f4 100644
--- a/src/flib_legacy/pio.F90
+++ b/src/flib_legacy/pio.F90
@@ -26,7 +26,7 @@ module pio
        pio_rearr_comm_p2p, pio_rearr_comm_coll,&
        pio_int, pio_real, pio_double, pio_noerr, iotype_netcdf, &
        iotype_pnetcdf,  pio_iotype_netcdf4p, pio_iotype_netcdf4c, &
-       pio_iotype_pnetcdf,pio_iotype_netcdf, pio_iotype_adios, pio_iotype_hdf5, &
+       pio_iotype_pnetcdf,pio_iotype_netcdf, pio_iotype_adios, pio_iotype_adiosc, pio_iotype_hdf5, &
        pio_global, pio_char, pio_write, pio_nowrite, pio_clobber, pio_noclobber, &
        pio_max_name, pio_max_var_dims, pio_rearr_subset, pio_rearr_box, pio_rearr_any,&
 #if defined(_NETCDF) || defined(_PNETCDF)
diff --git a/src/flib_legacy/pio_types.F90 b/src/flib_legacy/pio_types.F90
index 93093551b..c06ff26b9 100644
--- a/src/flib_legacy/pio_types.F90
+++ b/src/flib_legacy/pio_types.F90
@@ -101,6 +101,7 @@ module pio_types
 !!   - PIO_iotype_netcdf4c : parallel read/serial write of NetCDF4 (HDF5) files with data compression
 !!   - PIO_iotype_netcdf4p : parallel read/write of NETCDF4 (HDF5) files
 !!   - PIO_iotype_adios : parallel write of ADIOS files with subset rearrangement only
+!!   - PIO_iotype_adiosc : parallel write of ADIOS files with data compression
 !!   - PIO_iotype_hdf5 : parallel write of HDF5 files
 !>
     integer(i4), public, parameter ::  &
@@ -109,7 +110,8 @@ module pio_types
         PIO_iotype_netcdf4c = 3, &  ! netcdf4 (hdf5 format) file opened for compression (serial write access only)
         PIO_iotype_netcdf4p = 4, &  ! netcdf4 (hdf5 format) file opened in parallel (all netcdf4 files for read will be opened this way)
         PIO_iotype_adios = 5, &     ! parallel write of ADIOS files (Write only, rearr subset only)
-        PIO_iotype_hdf5 = 6         ! parallel write of HDF5 files
+        PIO_iotype_adiosc = 6, &    ! parallel write of ADIOS files with data compression
+        PIO_iotype_hdf5 = 7         ! parallel write of HDF5 files
 
 
 ! These are for backward compatability and should not be used or expanded upon