diff --git a/.gitattributes b/.gitattributes
index 6c03d02ccb034b211d97e05fcc68909b121340de..2633e7dd63319da347e0c9317a44b4adbd43c52e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -95,6 +95,13 @@ examples/cdi_write_ens.c -text
examples/cdi_write_f.f -text
examples/cdi_write_f2003.f90 -text
examples/compf -text
+examples/pio/Makefile.am -text
+examples/pio/Makefile.in -text
+examples/pio/cdi.inc -text
+examples/pio/collectData.c -text
+examples/pio/collectData2003.F90 -text
+examples/pio/collectDataNStreams.c -text
+examples/pio/compareResourcesArray.c -text
interfaces/CdiInfo.cpp -text
interfaces/Makefile.am -text
interfaces/Makefile.in -text
@@ -155,13 +162,6 @@ pioDoc/tex/pio_docu.tex -text
pioDoc/tex/stages.tex -text
pioDoc/tex/subprograms.tex -text
pioDoc/tex/timestepping.tex -text
-pioExamples/Makefile.am -text
-pioExamples/Makefile.in -text
-pioExamples/cdi.inc -text
-pioExamples/collectData.c -text
-pioExamples/collectData2003.F90 -text
-pioExamples/collectDataNStreams.c -text
-pioExamples/compareResourcesArray.c -text
src/Makefile.am -text
src/Makefile.in -text
src/basetime.c -text
diff --git a/Makefile.am b/Makefile.am
index 5938ed65217af41a11b6038350d8fdacda2400f9..6a1e6ecb0d229613d68a5dae8485237cf6f2dae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
#
-SUBDIRS = src interfaces app examples tests pioExamples
+SUBDIRS = src interfaces app examples tests examples/pio
#
EXTRA_DIST=config/default \
doc/cdi_cman.pdf \
diff --git a/Makefile.in b/Makefile.in
index 37886ae2f1325f0a326cfb843469e69faaaddeeb..a01bb59fe57d1682f85bdd9d3f50770d3faa407b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -174,9 +174,6 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
-ENABLE_NC2 = @ENABLE_NC2@
-ENABLE_NC4 = @ENABLE_NC4@
-ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
@@ -320,7 +317,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
#
-SUBDIRS = src interfaces app examples tests pioExamples
+SUBDIRS = src interfaces app examples tests examples/pio
#
EXTRA_DIST = config/default \
doc/cdi_cman.pdf \
diff --git a/app/Makefile.in b/app/Makefile.in
index d89b64baabeb8af3d9c146f219d0fc0029bdce36..d068af759f6325573a242bd060591281160163ba 100644
--- a/app/Makefile.in
+++ b/app/Makefile.in
@@ -148,9 +148,6 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
-ENABLE_NC2 = @ENABLE_NC2@
-ENABLE_NC4 = @ENABLE_NC4@
-ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
diff --git a/configure b/configure
index b6098509f148ea385b570fe047865e3251b79372..2c1f8ce711450181fc75e5eebe5d6475d1788b2a 100755
--- a/configure
+++ b/configure
@@ -680,9 +680,6 @@ JASPER_LIBS
NETCDF_LIBS
NETCDF_INCLUDE
NETCDF_ROOT
-ENABLE_NC4
-ENABLE_NC2
-ENABLE_NETCDF
NC_CONFIG
HDF5_LIBS
HDF5_INCLUDE
@@ -25242,9 +25239,6 @@ fi
NETCDF_ROOT=''
NETCDF_INCLUDE=''
NETCDF_LIBS=''
-ENABLE_NETCDF=no
-ENABLE_NC2=no
-ENABLE_NC4=no
# Check whether --with-netcdf was given.
if test "${with_netcdf+set}" = set; then :
@@ -25323,7 +25317,6 @@ if test "$ac_res" != no; then :
$as_echo "#define HAVE_LIBNETCDF 1" >>confdefs.h
- ENABLE_NETCDF=yes
else
as_fn_error $? "Could not link to netcdf library" "$LINENO" 5
fi
@@ -25375,7 +25368,6 @@ $as_echo "#define HAVE_NETCDF2 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- ENABLE_NC2=yes
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -25386,7 +25378,6 @@ $as_echo_n "checking netcdf's nc4 support... " >&6; }
$as_echo "#define HAVE_NETCDF4 1" >>confdefs.h
- ENABLE_NC4=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
@@ -25469,7 +25460,6 @@ if test "$ac_res" != no; then :
$as_echo "#define HAVE_LIBNETCDF 1" >>confdefs.h
- ENABLE_NETCDF=yes
else
as_fn_error $? "Could not link to netcdf library" "$LINENO" 5
fi
@@ -25534,7 +25524,6 @@ $as_echo_n "checking netcdf's nc2 support... " >&6; }
$as_echo "#define HAVE_NETCDF2 1" >>confdefs.h
- ENABLE_NC2=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
@@ -25547,7 +25536,6 @@ $as_echo_n "checking netcdf's nc4 support... " >&6; }
$as_echo "#define HAVE_NETCDF4 1" >>confdefs.h
- ENABLE_NC4=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
@@ -25575,9 +25563,6 @@ fi
-
-
-
# ----------------------------------------------------------------------
# Link application with JASPER library (needed for GRIB2 compression)
JASPER_LIBS=''
@@ -26968,7 +26953,7 @@ fi
ac_config_files="$ac_config_files tests/test_cksum_grib tests/test_cksum_nc tests/test_cksum_nc2 tests/test_cksum_nc4 tests/test_cksum_extra tests/test_cksum_service tests/test_cksum_ieg tests/pio_write_run tests/pio_cksum_mpinonb tests/pio_cksum_fpguard tests/pio_cksum_asynch tests/pio_cksum_writer util/serialrun"
-ac_config_files="$ac_config_files Makefile src/Makefile interfaces/Makefile app/Makefile tests/Makefile examples/Makefile cdi.settings pioExamples/Makefile src/pkgconfig/cdi.pc"
+ac_config_files="$ac_config_files Makefile src/Makefile interfaces/Makefile app/Makefile tests/Makefile examples/Makefile cdi.settings examples/pio/Makefile src/pkgconfig/cdi.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -28307,7 +28292,7 @@ do
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"cdi.settings") CONFIG_FILES="$CONFIG_FILES cdi.settings" ;;
- "pioExamples/Makefile") CONFIG_FILES="$CONFIG_FILES pioExamples/Makefile" ;;
+ "examples/pio/Makefile") CONFIG_FILES="$CONFIG_FILES examples/pio/Makefile" ;;
"src/pkgconfig/cdi.pc") CONFIG_FILES="$CONFIG_FILES src/pkgconfig/cdi.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/configure.ac b/configure.ac
index 09f599c3613d20ae06b97a2298c717a3117d125d..9119182f4242bb17d5cac962327c0c8d039e402a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,7 +195,7 @@ AC_CONFIG_FILES([tests/test_cksum_grib \
AC_OUTPUT([Makefile src/Makefile interfaces/Makefile app/Makefile \
tests/Makefile examples/Makefile cdi.settings \
- pioExamples/Makefile src/pkgconfig/cdi.pc])
+ examples/pio/Makefile src/pkgconfig/cdi.pc])
# ----------------------------------------------------------------------
# Show configuration
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 49cf5a0e4fd58a5585022a935dddb3b02f2ed9f4..22865ddd5b44dfd7042188437c0280375dbd4eec 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -177,9 +177,6 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
-ENABLE_NC2 = @ENABLE_NC2@
-ENABLE_NC4 = @ENABLE_NC4@
-ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
diff --git a/examples/cdi_read.c b/examples/cdi_read.c
index 3a588bdf76359e647bc25bcead3566a29ef93801..f619f376d72011b93ddea82bbddf288f0d6b28fc 100644
--- a/examples/cdi_read.c
+++ b/examples/cdi_read.c
@@ -1,8 +1,6 @@
#include <stdio.h>
#include "cdi.h"
-extern void reshListPrint ( char * filename );
-
int nlon = 12; // Number of longitudes
int nlat = 6; // Number of latitudes
int nlev = 5; // Number of levels
@@ -49,8 +47,6 @@ int main(void)
streamReadVar(streamID, varID2, var2, &nmiss);
}
- reshListPrint ( "reshListRead" );
-
// Close the input stream
streamClose(streamID);
diff --git a/pioExamples/Makefile.am b/examples/pio/Makefile.am
similarity index 69%
rename from pioExamples/Makefile.am
rename to examples/pio/Makefile.am
index d8d25708f6f1fa204db35bc0c8175356f1ccb99f..d47c0c4f5fd6b4a0a9bf79188016ee20f84534d8 100644
--- a/pioExamples/Makefile.am
+++ b/examples/pio/Makefile.am
@@ -12,16 +12,16 @@ AM_CFLAGS=-I$(top_srcdir)/src
collectData_SOURCES=collectData.c
-collectData_LDADD=-L../src -lcdi
+collectData_LDADD=-L../../src -lcdi
collectData2003_SOURCES=collectData2003.F90
-collectData2003_LDADD=-L../src -lcdi
+collectData2003_LDADD=-L../../src -lcdi
collectDataNStreams_SOURCES=collectDataNStreams.c
-collectDataNStreams_LDADD=-L../src -lcdi
+collectDataNStreams_LDADD=-L../../src -lcdi
compareResourcesArray_SOURCES=compareResourcesArray.c
-compareResourcesArray_LDADD=-L../src -lcdi
\ No newline at end of file
+compareResourcesArray_LDADD=-L../../src -lcdi
\ No newline at end of file
diff --git a/pioExamples/Makefile.in b/examples/pio/Makefile.in
similarity index 98%
rename from pioExamples/Makefile.in
rename to examples/pio/Makefile.in
index 1ebb0a676458b71dfc67214ed5f65776dd26fb86..d63e9981eb08e3c9010773c42397c7f9fdfaefc6 100644
--- a/pioExamples/Makefile.in
+++ b/examples/pio/Makefile.in
@@ -55,7 +55,7 @@ noinst_PROGRAMS = collectData$(EXEEXT) collectDataNStreams$(EXEEXT) \
$(am__EXEEXT_1) $(am__EXEEXT_2)
@USE_MPI_TRUE@am__append_1 = compareResourcesArray
@USE_FC_TRUE@am__append_2 = collectData2003
-subdir = pioExamples
+subdir = examples/pio
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
@@ -160,9 +160,6 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
-ENABLE_NC2 = @ENABLE_NC2@
-ENABLE_NC4 = @ENABLE_NC4@
-ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
@@ -306,13 +303,13 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CFLAGS = -I$(top_srcdir)/src
collectData_SOURCES = collectData.c
-collectData_LDADD = -L../src -lcdi
+collectData_LDADD = -L../../src -lcdi
collectData2003_SOURCES = collectData2003.F90
-collectData2003_LDADD = -L../src -lcdi
+collectData2003_LDADD = -L../../src -lcdi
collectDataNStreams_SOURCES = collectDataNStreams.c
-collectDataNStreams_LDADD = -L../src -lcdi
+collectDataNStreams_LDADD = -L../../src -lcdi
compareResourcesArray_SOURCES = compareResourcesArray.c
-compareResourcesArray_LDADD = -L../src -lcdi
+compareResourcesArray_LDADD = -L../../src -lcdi
all: all-am
.SUFFIXES:
@@ -326,9 +323,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pioExamples/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/pio/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu pioExamples/Makefile
+ $(AUTOMAKE) --gnu examples/pio/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/pioExamples/cdi.inc b/examples/pio/cdi.inc
similarity index 100%
rename from pioExamples/cdi.inc
rename to examples/pio/cdi.inc
diff --git a/pioExamples/collectData.c b/examples/pio/collectData.c
similarity index 100%
rename from pioExamples/collectData.c
rename to examples/pio/collectData.c
diff --git a/pioExamples/collectData2003.F90 b/examples/pio/collectData2003.F90
similarity index 100%
rename from pioExamples/collectData2003.F90
rename to examples/pio/collectData2003.F90
diff --git a/pioExamples/collectDataNStreams.c b/examples/pio/collectDataNStreams.c
similarity index 100%
rename from pioExamples/collectDataNStreams.c
rename to examples/pio/collectDataNStreams.c
diff --git a/pioExamples/compareResourcesArray.c b/examples/pio/compareResourcesArray.c
similarity index 100%
rename from pioExamples/compareResourcesArray.c
rename to examples/pio/compareResourcesArray.c
diff --git a/interfaces/Makefile.in b/interfaces/Makefile.in
index bd76433d3999f2155c4d0a0c409705b5d971a747..6477279aeb979faaf49f2b88a8738c3ee811418a 100644
--- a/interfaces/Makefile.in
+++ b/interfaces/Makefile.in
@@ -165,9 +165,6 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
-ENABLE_NC2 = @ENABLE_NC2@
-ENABLE_NC4 = @ENABLE_NC4@
-ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
diff --git a/src/Makefile.in b/src/Makefile.in
index 04fe1c537a02cfd946ba843490a78b9449cbdd32..574e41a1a209e869dbed850cd3f7329b2a5c9326 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -184,9 +184,6 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
-ENABLE_NC2 = @ENABLE_NC2@
-ENABLE_NC4 = @ENABLE_NC4@
-ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 17d2f6f208955c533512e086bb06f5b0f5a2930a..02241829922dd7e67498eceae9e32a2578f8148c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -160,9 +160,6 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
-ENABLE_NC2 = @ENABLE_NC2@
-ENABLE_NC4 = @ENABLE_NC4@
-ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@