starting to add vard functions

configure.ac

@@ -136,7 +136,7 @@ if test "x$enable_docs" = xyes; then
    if test "x$enable_developer_docs" = xyes; then
       AC_SUBST([C_SRC_FILES], ["../src/clib"])
    else
-      AC_SUBST([C_SRC_FILES], ["../src/clib/pio_nc.c ../src/clib/pio_nc4.c ../src/clib/pio_darray.c ../src/clib/pio_get_nc.c ../src/clib/pio_put_nc.c ../src/clib/pioc_support.c ../src/clib/pioc.c ../src/clib/pio_file.c ../src/clib/pio.h"])
+      AC_SUBST([C_SRC_FILES], ["../src/clib/pio_nc.c ../src/clib/pio_nc4.c ../src/clib/pio_darray.c ../src/clib/pio_get_nc.c ../src/clib/pio_put_nc.c ../src/clib/pioc_support.c ../src/clib/pioc.c ../src/clib/pio_file.c ../src/clib/pio.h ../src/clib/pio_get_vard.c ../src/clib/pio_put_vard.c"])
    fi
    AC_CONFIG_FILES([doc/Doxyfile])
 fi

src/clib/pio.h

@@ -1195,6 +1195,60 @@ extern "C" {
                                 const PIO_Offset *count, const PIO_Offset *stride,
                                 const unsigned long long *op);
 
+    /* Data reads - vard. */
+    int PIOc_get_vard(int ncid, int varid, int decompid, const PIO_Offset recnum, void *buf);
+    int PIOc_get_vard_text(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                           char *buf);
+    int PIOc_get_vard_schar(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                            signed char *buf);
+    int PIOc_get_vard_short(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                            short *buf);
+    int PIOc_get_vard_int(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                          int *buf);
+    int PIOc_get_vard_float(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                            float *buf);
+    int PIOc_get_vard_long(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                           long *buf);
+    int PIOc_get_vard_double(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                             double *buf);
+    int PIOc_get_vard_uchar(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                            unsigned char *buf);
+    int PIOc_get_vard_ushort(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                             unsigned short *buf);
+    int PIOc_get_vard_uint(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                           unsigned int *buf);
+    int PIOc_get_vard_longlong(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                               long long *buf);
+    int PIOc_get_vard_ulonglong(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                                unsigned long long *buf);
+
+    /* Data writes - vara. */
+    int PIOc_put_vard(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                      const void *buf);
+    int PIOc_put_vard_text(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                           const char *op);
+    int PIOc_put_vard_schar(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                            const signed char *op);
+    int PIOc_put_vard_short(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                            const short *op);
+    int PIOc_put_vard_int(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                          const int *op);
+    int PIOc_put_vard_long(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                           const long *op);
+    int PIOc_put_vard_float(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                            const float *op);
+    int PIOc_put_vard_double(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                             const double *op);
+    int PIOc_put_vard_uchar(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                            const unsigned char *op);
+    int PIOc_put_vard_ushort(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                             const unsigned short *op);
+    int PIOc_put_vard_uint(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                           const unsigned int *op);
+    int PIOc_put_vard_longlong(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                               const long long *op);
+    int PIOc_put_vard_ulonglong(int ncid, int varid, int decompid, const PIO_Offset recnum,
+                                const unsigned long long *op);
 #if defined(__cplusplus)
 }
 #endif

src/clib/pio_get_vard.c

@@ -0,0 +1,290 @@
+/**
+ * @file
+ * PIO functions to get data with distributed arrays.
+ *
+ * @author Ed Hartnett
+ * @date  2019
+ *
+ * @see https://github.com/NCAR/ParallelIO
+ */
+#include <config.h>
+#include <pio.h>
+#include <pio_internal.h>
+
+/**
+ * @addtogroup PIO_get_var_c Read Data
+ * Read data from a variable in C.
+ * @{
+ */
+
+/**
+ * Get a muti-dimensional subset of a text variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_text(int ncid, int varid, int decompid,
+                       const PIO_Offset recnum, char *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_CHAR, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of an unsigned char variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_uchar(int ncid, int varid, int decompid,
+                        const PIO_Offset recnum, unsigned char *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_UBYTE, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of a signed char variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_schar(int ncid, int varid, int decompid,
+                        const PIO_Offset recnum, signed char *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_BYTE, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of an unsigned 16-bit integer
+ * variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_ushort(int ncid, int varid, int decompid,
+                         const PIO_Offset recnum, unsigned short *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_USHORT,
+                            buf);
+}
+
+/**
+ * Get a muti-dimensional subset of a 16-bit integer variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_short(int ncid, int varid, int decompid,
+                        const PIO_Offset recnum, short *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_SHORT, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of a 64-bit integer variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_long(int ncid, int varid, int decompid,
+                       const PIO_Offset recnum, long *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL,
+                            PIO_LONG_INTERNAL, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of an unsigned integer variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_uint(int ncid, int varid, int decompid,
+                       const PIO_Offset recnum, unsigned int *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_UINT, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of an integer variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_int(int ncid, int varid, int decompid,
+                      const PIO_Offset recnum, int *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_INT, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of a floating point variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_float(int ncid, int varid, int decompid,
+                        const PIO_Offset recnum, float *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_FLOAT, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of a 64-bit floating point variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_double(int ncid, int varid, int decompid,
+                         const PIO_Offset recnum, double *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_DOUBLE,
+                            buf);
+}
+
+/**
+ * Get a muti-dimensional subset of an unsigned 64-bit integer
+ * variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_ulonglong(int ncid, int varid, int decompid,
+                            const PIO_Offset recnum, unsigned long long *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_UINT64,
+                            buf);
+}
+
+/**
+ * Get a muti-dimensional subset of a 64-bit integer variable.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard_longlong(int ncid, int varid, int decompid,
+                           const PIO_Offset recnum, long long *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_INT64, buf);
+}
+
+/**
+ * Get a muti-dimensional subset of a variable the same type
+ * as the variable in the file.
+ *
+ * This routine is called collectively by all tasks in the
+ * communicator ios.union_comm.
+ *
+ * @param ncid identifies the netCDF file
+ * @param varid the variable ID number
+ * @param decompid the decomposition ID.
+ * @param recnum the record number.
+ * @param buf pointer that will get the data.
+ * @return PIO_NOERR on success, error code otherwise.
+ * @author Ed Hartnett
+ */
+int PIOc_get_vard(int ncid, int varid, int decompid,
+                  const PIO_Offset recnum, void *buf)
+{
+    return PIOc_get_vard_tc(ncid, varid, decompid, recnum, NULL, NC_NAT, buf);
+}
+
+
+/**
+ * @}
+ */