Remove suffix '_serial' for all tests and examples.

.gitignore

@@ -42,11 +42,11 @@ Makefile.in
 /tests/pio_cksum_nc2.test
 /tests/pio_cksum_nc4.test
 /tests/pio_cksum_writer.test
+/tests/pio_write_deco2d_run
 /tests/pio_write_deco2d_run_parallel.test
-/tests/pio_write_deco2d_run_serial
 /tests/pio_write_dist_array.test
+/tests/pio_write_run
 /tests/pio_write_run_parallel.test
-/tests/pio_write_run_serial
 /tests/test_cdf_const
 /tests/test_cdf_transformation
 /tests/test_cksum_extra
@@ -81,12 +81,12 @@ Makefile
 /examples/cdi_write_hybrid
 /examples/pio/*.parallel.F90
 /examples/pio/*.parallel.c
+/examples/pio/collectData
+/examples/pio/collectData2003
 /examples/pio/collectData2003_parallel
-/examples/pio/collectData2003_serial
+/examples/pio/collectDataNStreams
 /examples/pio/collectDataNStreams_parallel
-/examples/pio/collectDataNStreams_serial
 /examples/pio/collectData_parallel
-/examples/pio/collectData_serial
 /examples/pio/compareResourcesArray
 /interfaces/CdiInfo
 /interfaces/python/*.pyc
@@ -103,10 +103,10 @@ Makefile
 /tests/cksum_verify
 /tests/cksum_write
 /tests/cksum_write_chunk
+/tests/pio_write
+/tests/pio_write_deco2d
 /tests/pio_write_deco2d_parallel
-/tests/pio_write_deco2d_serial
 /tests/pio_write_parallel
-/tests/pio_write_serial
 /tests/test_byteswap
 /tests/test_cdf_read
 /tests/test_cdf_write

configure.ac

@@ -703,11 +703,11 @@ AC_CONFIG_FILES([
   tests/pio_cksum_nc2.test
   tests/pio_cksum_nc4.test
   tests/pio_cksum_writer.test
+  tests/pio_write_deco2d_run
   tests/pio_write_deco2d_run_parallel.test
-  tests/pio_write_deco2d_run_serial
   tests/pio_write_dist_array.test
+  tests/pio_write_run
   tests/pio_write_run_parallel.test
-  tests/pio_write_run_serial
   tests/test_cdf_const
   tests/test_cdf_transformation
   tests/test_cksum_extra

examples/pio/Makefile.am

 noinst_PROGRAMS =
 
 EXTRA_PROGRAMS = \
-  collectDataNStreams_serial \
-  collectData_serial
+  collectData \
+  collectDataNStreams
 
 if ENABLE_MPI
 EXTRA_PROGRAMS += \
@@ -13,7 +13,7 @@ endif ENABLE_MPI
 
 if ENABLE_CF_INTERFACE
 if BUILD_FC_PROGRAMS
-EXTRA_PROGRAMS += collectData2003_serial
+EXTRA_PROGRAMS += collectData2003
 endif BUILD_FC_PROGRAMS
 if BUILD_PIO_FC_PROGRAMS
 EXTRA_PROGRAMS += collectData2003_parallel
@@ -41,18 +41,18 @@ endif
 
 LDADD = $(top_builddir)/src/libcdi.la
 
-collectDataNStreams_serial_SOURCES = collectDataNStreams.c
-nodist_collectDataNStreams_parallel_SOURCES = collectDataNStreams.parallel.c
-collectDataNStreams_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
-
-collectData_serial_SOURCES = collectData.c
+collectData_SOURCES = collectData.c
 nodist_collectData_parallel_SOURCES = collectData.parallel.c
 collectData_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
 
+collectDataNStreams_SOURCES = collectDataNStreams.c
+nodist_collectDataNStreams_parallel_SOURCES = collectDataNStreams.parallel.c
+collectDataNStreams_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+
 compareResourcesArray_SOURCES = compareResourcesArray.c
 compareResourcesArray_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
 
-collectData2003_serial_SOURCES = collectData2003.F90
+collectData2003_SOURCES = collectData2003.F90
 nodist_collectData2003_parallel_SOURCES = collectData2003.parallel.F90
 collectData2003_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_FC_LIB) $(MPI_FC_LIB)
 

tests/Makefile.am

 TESTS = \
   calendar_test1 \
   cksum_verify \
-  pio_write_deco2d_run_serial \
-  pio_write_run_serial \
+  pio_write_deco2d_run \
+  pio_write_run \
   test_byteswap \
   test_cdf_const \
   test_cdf_transformation \
@@ -61,8 +61,8 @@ test_PROGRAMS_ = \
   cksum_verify \
   cksum_write \
   cksum_write_chunk \
-  pio_write_deco2d_serial \
-  pio_write_serial \
+  pio_write \
+  pio_write_deco2d \
   test_byteswap \
   test_month_adjust \
   test_resource_copy \
@@ -120,35 +120,35 @@ cksum_write_chunk_SOURCES = \
   simple_model_helper.c \
   simple_model_helper.h
 
-pio_write_deco2d_serial_SOURCES = \
-  deco2d_model.c \
+pio_write_SOURCES = \
   pio_write.c \
   pio_write.h \
   pio_write_setup_grid.c \
   pio_write_setup_grid.h \
+  simple_model.c \
   simple_model_helper.c \
   simple_model_helper.h
-nodist_pio_write_deco2d_parallel_SOURCES = \
-  deco2d_model.parallel.c \
+nodist_pio_write_parallel_SOURCES = \
   pio_write.parallel.c \
   pio_write_setup_grid.parallel.c \
+  simple_model.parallel.c \
   simple_model_helper.parallel.c
-pio_write_deco2d_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+pio_write_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
 
-pio_write_serial_SOURCES = \
+pio_write_deco2d_SOURCES = \
+  deco2d_model.c \
   pio_write.c \
   pio_write.h \
   pio_write_setup_grid.c \
   pio_write_setup_grid.h \
-  simple_model.c \
   simple_model_helper.c \
   simple_model_helper.h
-nodist_pio_write_parallel_SOURCES = \
+nodist_pio_write_deco2d_parallel_SOURCES = \
+  deco2d_model.parallel.c \
   pio_write.parallel.c \
   pio_write_setup_grid.parallel.c \
-  simple_model.parallel.c \
   simple_model_helper.parallel.c
-pio_write_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
+pio_write_deco2d_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(PPM_CORE_C_LIB) $(YAXT_C_LIB)
 
 test_byteswap_SOURCES = test_byteswap.c
 

tests/pio_write_deco2d_run_serial.in → tests/pio_write_deco2d_run.in

 #!@SHELL@
 suffix="${suffix-grb}"
-pio_write=./pio_write_deco2d_serial
+pio_write=./pio_write_deco2d
 
-. ./pio_write_run_serial
+. ./pio_write_run
 #
 # Local Variables:
 # mode: sh

tests/pio_write_run_serial.in → tests/pio_write_run.in

@@ -2,7 +2,7 @@
 
 prefix=${0##*/}
 suffix="${suffix-grb}"
-pio_write=${pio_write-./pio_write_serial}
+pio_write=${pio_write-./pio_write}
 
 case ${suffix} in
   grb)