From 99c758c64924ef0ccaf7ad25d6b8f19f4763ac3d Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Thu, 16 Aug 2018 11:43:01 -0600 Subject: [PATCH] cleaned up configure.ac, fixed parallel test warning --- configure.ac | 14 ++++---------- nc_test4/tst_parallel.c | 6 +----- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index efb2ac62a..af3343562 100644 --- a/configure.ac +++ b/configure.ac @@ -1,16 +1,13 @@ # -*- Autoconf -*- ## Process this file with autoconf to produce a configure script. -# This is part of Unidata's netCDF package. Copyright 2005-2012, see +# This is part of Unidata's netCDF package. Copyright 2005-2018, see # the COPYRIGHT file for more information. # Ed Hartnett, Ward Fisher, Dennis Heimbigner # Recall that ${VAR-exp} expands to $VAR if var is set (even to null), # and to exp otherwise. -## This puts the cvs ID tag in the output configure script. -AC_REVISION([$Id: configure.ac,v 1.450 2010/05/28 19:42:47 dmh Exp $]) - # Running autoconf on this file will trigger a warning if # autoconf is not at least the specified version. AC_PREREQ([2.59]) @@ -1510,8 +1507,9 @@ AC_CONFIG_FILES(examples/C/findplugin.sh:nc_test4/findplugin.in) ##### AC_MSG_NOTICE([generating header files and makefiles]) +AC_CONFIG_FILES([nc_test4/run_par_test.sh], [chmod ugo+x nc_test4/run_par_test.sh]) +AC_CONFIG_FILES([nc-config], [chmod 755 nc-config]) AC_CONFIG_FILES([Makefile - nc-config netcdf.pc libnetcdf.settings postinstall.sh @@ -1541,7 +1539,6 @@ AC_CONFIG_FILES([Makefile docs/images/Makefile nctest/Makefile nc_test4/Makefile - nc_test4/run_par_test.sh nc_test/Makefile ncdap_test/Makefile ncdap_test/testdata3/Makefile @@ -1549,10 +1546,7 @@ AC_CONFIG_FILES([Makefile ncdap_test/expectremote3/Makefile dap4_test/Makefile plugins/Makefile - ], - [test -f nc_test4/run_par_test.sh && chmod ugo+x nc_test4/run_par_test.sh && test -f nc-config && chmod 755 nc-config]) + ]) AC_OUTPUT() - #mv -f ${abs_top_srcdir}/test_common.sh ${abs_top_builddir}/test_common.sh - cat libnetcdf.settings diff --git a/nc_test4/tst_parallel.c b/nc_test4/tst_parallel.c index 171c04751..f09b1f4a9 100644 --- a/nc_test4/tst_parallel.c +++ b/nc_test4/tst_parallel.c @@ -40,7 +40,7 @@ main(int argc, char **argv) int ncid, v1id, dimids[NDIMS]; size_t start[NDIMS], count[NDIMS]; - int data[DIMSIZE * DIMSIZE], i, res; + int i, res; int slab_data[DIMSIZE * DIMSIZE / 4]; /* one slab */ char file_name[NC_MAX_NAME + 1]; @@ -82,10 +82,6 @@ main(int argc, char **argv) /* Create phony data. We're going to write a 24x24 array of ints, in 4 sets of 144. */ - /*printf("mpi_rank*QTR_DATA=%d (mpi_rank+1)*QTR_DATA-1=%d\n", - mpi_rank*QTR_DATA, (mpi_rank+1)*QTR_DATA);*/ - for (i = mpi_rank * QTR_DATA; i < (mpi_rank + 1) * QTR_DATA; i++) - data[i] = mpi_rank; for (i = 0; i < DIMSIZE * DIMSIZE / 4; i++) slab_data[i] = mpi_rank;