Consolidation with CDI-PIO (develop)

Generally, this is !11 (merged) rebased onto the develop branch.

This is the first develop-based version accepted by the Buildbot of ICON: https://buildbot.dkrz.de/grid?branch=m300488/cdi-pio-2-integration

examples/pio/Makefile.am

 noinst_PROGRAMS = \
-  collectData \
-  collectDataNStreams
+  collectDataNStreams_serial \
+  collectData_serial
 
 if ENABLE_MPI
-noinst_PROGRAMS += compareResourcesArray
+noinst_PROGRAMS += \
+  collectDataNStreams_parallel \
+  collectData_parallel \
+  compareResourcesArray
 endif ENABLE_MPI
 
 if ENABLE_CF_INTERFACE
-if ENABLE_MPI
+noinst_PROGRAMS += collectData2003_serial
 if BUILD_PIO_FC_PROGRAMS
-noinst_PROGRAMS += collectData2003
+noinst_PROGRAMS += collectData2003_parallel
 endif BUILD_PIO_FC_PROGRAMS
-else !ENABLE_MPI
-noinst_PROGRAMS += collectData2003
-endif !ENABLE_MPI
 endif ENABLE_CF_INTERFACE
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
-if ENABLE_MPI
-AM_CPPFLAGS += -DUSE_MPI
-endif ENABLE_MPI
 AM_CFLAGS = $(YAXT_C_INCLUDE) $(MPI_C_INCLUDE)
 
 AM_FCFLAGS =
 if ENABLE_CF_INTERFACE
 AM_FCFLAGS += $(FC_OPTINC)$(top_builddir)/src $(FC_OPTINC)$(top_srcdir)/src
 endif ENABLE_CF_INTERFACE
-if BUILD_PIO_FC_PROGRAMS
-AM_FCFLAGS += $(FC_DEFINE)USE_MPI
-endif BUILD_PIO_FC_PROGRAMS
 AM_FCFLAGS += $(YAXT_FC_MOD) $(MPI_FC_MOD)
 
 AM_LDFLAGS =
@@ -37,18 +31,27 @@ AM_LDFLAGS += -all-static
 endif
 
 LDADD = $(top_builddir)/src/libcdi.la
-if ENABLE_MPI
-LDADD += $(top_builddir)/src/libcdipio.la
-endif ENABLE_MPI
 
-collectData_SOURCES = collectData.c
+collectDataNStreams_serial_SOURCES = collectDataNStreams.c
+
+collectDataNStreams_parallel_SOURCES = $(collectDataNStreams_serial_SOURCES)
+collectDataNStreams_parallel_CPPFLAGS = -DUSE_MPI $(AM_CPPFLAGS)
+collectDataNStreams_parallel_LDADD = $(top_builddir)/src/libcdipio.la
 
-collectDataNStreams_SOURCES = collectDataNStreams.c
+collectData_serial_SOURCES = collectData.c
+
+collectData_parallel_SOURCES = $(collectData_serial_SOURCES)
+collectData_parallel_CPPFLAGS = -DUSE_MPI $(AM_CPPFLAGS)
+collectData_parallel_LDADD = $(top_builddir)/src/libcdipio.la
 
 compareResourcesArray_SOURCES = compareResourcesArray.c
+compareResourcesArray_LDADD = $(top_builddir)/src/libcdipio.la
+
+collectData2003_serial_SOURCES = collectData2003.F90
 
-collectData2003_SOURCES = collectData2003.F90
-collectData2003_LDADD = $(LDADD) $(YAXT_FC_LIB) $(MPI_FC_LIB)
+collectData2003_parallel_SOURCES = $(collectData2003_serial_SOURCES)
+collectData2003_parallel_FCFLAGS = $(FC_DEFINE)USE_MPI $(AM_FCFLAGS)
+collectData2003_parallel_LDADD = $(top_builddir)/src/libcdipio.la $(YAXT_FC_LIB) $(MPI_FC_LIB)
 
 clean-local:
 	-rm -f *.grb