Merge pull request #84 from NCAR/ejh_darray4

Ejh darray4 - splitting async code, starting to add LOG statements and comments, cleanup of docs
E3SM-Project · Jun 22, 2016 · 7febfee · 7febfee
2 parents c902eb9 + 5831e9f
commit 7febfee
Show file tree

Hide file tree

Showing 6 changed files with 2,432 additions and 5 deletions.
diff --git a/src/clib/CMakeLists.txt b/src/clib/CMakeLists.txt
@@ -14,7 +14,6 @@ set (PIO_C_SRCS topology.c
                 pioc_sc.c
                 pio_spmd.c
                 pio_rearrange.c
-                pio_darray.c
 		pio_nc4.c
                 bget.c)
 
@@ -23,9 +22,10 @@ set (PIO_GENNC_SRCS ${CMAKE_CURRENT_BINARY_DIR}/pio_put_nc.c
   ${CMAKE_CURRENT_BINARY_DIR}/pio_nc.c)
 
 if (PIO_ENABLE_ASYNC)
-  set (PIO_ADDL_SRCS pio_nc_async.c pio_put_nc_async.c pio_get_nc_async.c pio_msg.c pio_varm.c)
+  set (PIO_ADDL_SRCS pio_nc_async.c pio_put_nc_async.c pio_get_nc_async.c
+    pio_msg.c pio_varm.c pio_darray_async.c)
 else ()
-  set (PIO_ADDL_SRCS ${PIO_GENNC_SRCS})
+  set (PIO_ADDL_SRCS pio_darray.c ${PIO_GENNC_SRCS})
 endif ()
 
 add_library (pioc ${PIO_C_SRCS} ${PIO_ADDL_SRCS})

diff --git a/src/clib/bget.c b/src/clib/bget.c
@@ -397,7 +397,6 @@
     BGET CONFIGURATION
     ==================
 */
-//#define PIO_USE_MALLOC 1
 #ifdef PIO_USE_MALLOC
 #include <stdlib.h>
 #endif

diff --git a/src/clib/pio.h b/src/clib/pio.h
@@ -46,7 +46,7 @@
 typedef struct var_desc_t
 {
     /** The unlimited dimension in the netCDF file (typically the time
-     * dimension). */
+     * dimension). -1 if there is no unlimited dimension. */
     int record;
 
     /** Number of dimensions for this variable. */