now setting macro HDF5_PARALLEL for ncint builds to please ncdispatch.h

jedwards4b · Jul 3, 2019 · 168edc6 · 168edc6
1 parent 218f8e2
commit 168edc6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -275,6 +275,12 @@ fi
 if test "x$enable_netcdf_integration" = xyes -a "x$have_netcdf_par" = xno; then
    AC_MSG_ERROR([Cannot use netCDF integration unless netCDF library was built for parallel I/O.])
 fi
+# These are needed by ncdispatch.h. Only build with HDF5 parallel
+# versions of netCDF. */
+if test "x$enable_netcdf_integration" = xyes; then
+   AC_SUBST([HDF5_PARALLEL], [1])
+fi
+
 AM_CONDITIONAL(BUILD_NCINT, [test "x$enable_netcdf_integration" = xyes])
 
 AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90])

diff --git a/src/ncint/ncint_pio.c b/src/ncint/ncint_pio.c
@@ -19,5 +19,5 @@ int
 nc_init_intracomm(MPI_Comm comp_comm, int num_iotasks, int stride, int base, int rearr,
                   int *iosysidp)
 {
-    return PIO_NOERR;
+    return PIOc_Init_Intracomm(comp_comm, num_iotasks, stride, base, rearr, iosysidp);
 }