Commit 4e9f4dcd authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

merged changes from branch

parents 95ab9af7 315cf517
......@@ -162,13 +162,23 @@ interfaces/ruby/testObj.rb -text
interfaces/testdata/gridTest.nc -text
interfaces/testdata/mulval.grb -text
interfaces/testdata/mulval.nc -text
m4/ac_lang_program_fortran.m4 -text
m4/acx_assert_lang_is_fortran_variant.m4 -text
m4/acx_c_package.m4 -text
m4/acx_check_strptr_convert.m4 -text
m4/acx_execinfo.m4 -text
m4/acx_fortran_check_include.m4 -text
m4/acx_fortran_package.m4 -text
m4/acx_lang_c_check_include.m4 -text
m4/acx_lang_check_include.m4 -text
m4/acx_lang_fortran_check_include.m4 -text
m4/acx_lang_other_suffix_conftest.m4 -text
m4/acx_lang_package.m4 -text
m4/acx_option_search_libs.m4 -text
m4/acx_options.m4 -text
m4/acx_sl_fc_mod_path_flag.m4 -text
m4/acx_sl_mod_suffix.m4 -text
m4/asx_tr_arg.m4 -text
m4/asx_unset.m4 -text
m4/ax_pthread.m4 -text
m4/libtool.m4 -text
......@@ -211,6 +221,7 @@ src/cgribexlib.c -text
src/cksum.c -text
src/cksum.h -text
src/config.h.in -text
src/create_uuid.h -text
src/datetime.h -text
src/dmemory.c -text
src/dmemory.h -text
......@@ -356,8 +367,6 @@ tests/cksum_read.c -text
tests/cksum_verify.c -text
tests/cksum_write.c -text
tests/cksum_write_chunk.c -text
tests/create_uuid.c -text
tests/create_uuid.h -text
tests/deco2d_model.c -text
tests/ensure_array_size.c -text
tests/ensure_array_size.h -text
......
2015-03-12 Uwe Schulzweida
2015-03-26 Uwe Schulzweida
* Version 1.6.8 released
* using CGRIBEX library version 1.7.1
2015-02-18 Uwe Schulzweida
* cdiDecodeTimevalue: fix rounding error for negativ timevalue
2015-02-12 Uwe Schulzweida
* scan netcdf time units attribute (bug fix)
......
......@@ -96,17 +96,26 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_assert_lang_is_fortran_variant.m4 \
$(top_srcdir)/m4/acx_c_package.m4 \
$(top_srcdir)/m4/acx_check_strptr_convert.m4 \
$(top_srcdir)/m4/acx_execinfo.m4 \
$(top_srcdir)/m4/acx_fortran_package.m4 \
$(top_srcdir)/m4/acx_lang_check_include.m4 \
$(top_srcdir)/m4/acx_lang_other_suffix_conftest.m4 \
$(top_srcdir)/m4/acx_lang_package.m4 \
$(top_srcdir)/m4/acx_option_search_libs.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_unset.m4 $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/starlink_fpp.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/ac_lang_program_fortran.m4 \
$(top_srcdir)/m4/acx_lang_fortran_check_include.m4 \
$(top_srcdir)/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
......@@ -249,6 +258,7 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
ENABLE_MPI = @ENABLE_MPI@
ENABLE_NC2 = @ENABLE_NC2@
ENABLE_NC4 = @ENABLE_NC4@
ENABLE_NETCDF = @ENABLE_NETCDF@
......@@ -296,6 +306,11 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MPIROOT = @MPIROOT@
MPI_C_INCLUDE = @MPI_C_INCLUDE@
MPI_C_LIB = @MPI_C_LIB@
MPI_FC_INCLUDE = @MPI_FC_INCLUDE@
MPI_FC_LIB = @MPI_FC_LIB@
MPI_LAUNCH = @MPI_LAUNCH@
NC_CONFIG = @NC_CONFIG@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
......
......@@ -14,6 +14,9 @@ AC_DEFUN([ACX_CHECK_CFINT],
[AC_DEFINE(HAVE_CF_INTERFACE, [1],
[Define if C / Fortran interface cfortran.h works])])
])
m4_include([m4/ac_lang_program_fortran.m4])
m4_include([m4/acx_lang_fortran_check_include.m4])
m4_include([m4/acx_lang_c_check_include.m4])
dnl
dnl Local Variables:
dnl mode: autoconf
......
......@@ -1184,12 +1184,18 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/acx_assert_lang_is_fortran_variant.m4])
m4_include([m4/acx_c_package.m4])
m4_include([m4/acx_check_strptr_convert.m4])
m4_include([m4/acx_execinfo.m4])
m4_include([m4/acx_fortran_package.m4])
m4_include([m4/acx_lang_check_include.m4])
m4_include([m4/acx_lang_other_suffix_conftest.m4])
m4_include([m4/acx_lang_package.m4])
m4_include([m4/acx_option_search_libs.m4])
m4_include([m4/acx_options.m4])
m4_include([m4/acx_sl_fc_mod_path_flag.m4])
m4_include([m4/acx_sl_mod_suffix.m4])
m4_include([m4/asx_tr_arg.m4])
m4_include([m4/asx_unset.m4])
m4_include([m4/ax_pthread.m4])
m4_include([m4/libtool.m4])
......
......@@ -89,17 +89,26 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_assert_lang_is_fortran_variant.m4 \
$(top_srcdir)/m4/acx_c_package.m4 \
$(top_srcdir)/m4/acx_check_strptr_convert.m4 \
$(top_srcdir)/m4/acx_execinfo.m4 \
$(top_srcdir)/m4/acx_fortran_package.m4 \
$(top_srcdir)/m4/acx_lang_check_include.m4 \
$(top_srcdir)/m4/acx_lang_other_suffix_conftest.m4 \
$(top_srcdir)/m4/acx_lang_package.m4 \
$(top_srcdir)/m4/acx_option_search_libs.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_unset.m4 $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/starlink_fpp.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/ac_lang_program_fortran.m4 \
$(top_srcdir)/m4/acx_lang_fortran_check_include.m4 \
$(top_srcdir)/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
......@@ -222,6 +231,7 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
ENABLE_MPI = @ENABLE_MPI@
ENABLE_NC2 = @ENABLE_NC2@
ENABLE_NC4 = @ENABLE_NC4@
ENABLE_NETCDF = @ENABLE_NETCDF@
......@@ -269,6 +279,11 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MPIROOT = @MPIROOT@
MPI_C_INCLUDE = @MPI_C_INCLUDE@
MPI_C_LIB = @MPI_C_LIB@
MPI_FC_INCLUDE = @MPI_FC_INCLUDE@
MPI_FC_LIB = @MPI_FC_LIB@
MPI_LAUNCH = @MPI_LAUNCH@
NC_CONFIG = @NC_CONFIG@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
......
{
"CC" : "@CC@",
"CPP" : "@CPP@",
"CPPFLAGS" : "@CPPFLAGS@",
"CFLAGS" : "@CFLAGS@",
"LDFLAGS" : "@LDFLAGS@",
"LIBS" : "@LIBS@",
"FC" : "@FC@",
"F77" : "@F77@",
"FCFLAGS" : "@FCFLAGS@",
"LD" : "@LD@",
"NM" : "@NM@",
"AR" : "@AR@",
"AS" : "@AS@",
"DLLTOOL" : "@DLLTOOL@",
"OBJDUMP" : "@OBJDUMP@",
"STRIP" : "@STRIP@",
"RANLIB" : "@RANLIB@",
"INSTALL" : "@INSTALL@",
"build" : {
"tools" : {
"CC" : "@CC@",
"CPP" : "@CPP@",
"CPPFLAGS" : "@CPPFLAGS@",
"CFLAGS" : "@CFLAGS@",
"LDFLAGS" : "@LDFLAGS@",
"LIBS" : "@LIBS@",
"FC" : "@FC@",
"F77" : "@F77@",
"FCFLAGS" : "@FCFLAGS@",
"LD" : "@LD@",
"NM" : "@NM@",
"AR" : "@AR@",
"AS" : "@AS@",
"DLLTOOL" : "@DLLTOOL@",
"OBJDUMP" : "@OBJDUMP@",
"STRIP" : "@STRIP@",
"RANLIB" : "@RANLIB@",
"INSTALL" : "@INSTALL@"
},
"platform" : {
"USER_NAME" : "@USER_NAME@",
"HOST_NAME" : "@HOST_NAME@",
"SYSTEM_TYPE" : "@SYSTEM_TYPE@"
},
"libraries" : {
"threads" : {
"lib" : "@THREADS_LIBS@",
"include" : "@THREADS_INCLUDE@"
},
"mpi" : {
"libs" : "@MPI_C_LIB@",
"cflags" : "@MPI_C_INCLUDE@",
"fclibs" : "@MPI_FC_LIB@",
"fcflags" : "@MPI_FC_INCLUDE@"
},
"zlib" : {
"lib" : "@ZLIB_LIBS@",
"include" : "@ZLIB_INCLUDE@"
},
"szlib" : {
"lib" : "@SZLIB_LIBS@",
"include" : "@SZLIB_INCLUDE@"
},
"hdf5" : {
"lib" : "@HDF5_LIBS@",
"include" : "@HDF5_INCLUDE@"
},
"netcdf" : {
"lib" : "@NETCDF_LIBS@",
"include" : "@NETCDF_INCLUDE@"
},
"grib_api" : {
"lib" : "@GRIB_API_LIBS@",
"include" : "@GRIB_API_INCLUDE@"
},
"jasper" : {
"lib" : "@JASPER_LIBS@"
}
}
},
"enable_cdi_lib" : @ENABLE_CDI_LIB@,
"grib" : "@ENABLE_GRIB@",
"cgribex" : "@ENABLE_CGRIBEX@",
"service" : "@ENABLE_SERVICE@",
"extra" : "@ENABLE_EXTRA@",
"ieg" : "@ENABLE_IEG@",
"threads" : {
"lib" : "@THREADS_LIBS@",
"include" : "@THREADS_INCLUDE@"
},
"zlib" : {
"lib" : "@ZLIB_LIBS@",
"include" : "@ZLIB_INCLUDE@",
},
"szlib" : {
"lib" : "@SZLIB_LIBS@",
"include" : "@SZLIB_INCLUDE@"
},
"hdf5" : {
"lib" : "@HDF5_LIBS@",
"include" : "@HDF5_INCLUDE@"
},
"netcdf" : {
"lib" : "@NETCDF_LIBS@",
"include" : "@NETCDF_INCLUDE@"
},
"grib_api" : {
"lib" : "@GRIB_API_LIBS@",
"include" : "@GRIB_API_INCLUDE@"
},
"jasper" : {
"lib" : "@JASPER_LIBS@"
},
"enable_python" : @ENABLE_PYTHON@,
"enable_ruby" : @ENABLE_RUBY@,
"USER_NAME" : "@USER_NAME@",
"HOST_NAME" : "@HOST_NAME@",
"SYSTEM_TYPE" : "@SYSTEM_TYPE@"
"features" : {
"enable_cdi_lib" : @ENABLE_CDI_LIB@,
"grib" : "@ENABLE_GRIB@",
"cgribex" : "@ENABLE_CGRIBEX@",
"service" : "@ENABLE_SERVICE@",
"extra" : "@ENABLE_EXTRA@",
"ieg" : "@ENABLE_IEG@",
"enable_mpi" : @ENABLE_MPI@,
"parallel_nc4" : @HAVE_PARALLEL_NC4@,
"enable_python" : @ENABLE_PYTHON@,
"enable_ruby" : @ENABLE_RUBY@
}
}
This diff is collapsed.
......@@ -11,6 +11,8 @@ echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
CONFIG_ABORT=yes
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
dnl forbid acx macro names from remaining unexpanded
m4_pattern_forbid([^ACX_])
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
......@@ -129,7 +131,23 @@ ACX_OPTIONS
AM_CONDITIONAL([ENABLE_NETCDF],[test x$ENABLE_NETCDF = xyes])
# ----------------------------------------------------------------------
# Compile with MPI support
AC_ARG_ENABLE(mpi,AS_HELP_STRING([--enable-mpi],[Compile with MPI compiler [default=no]]),enable_mpi=yes,enable_mpi=no)
AC_ARG_ENABLE([mpi],
AS_HELP_STRING([--enable-mpi],
[Compile with MPI compiler @<:@default=no@:>@]),
[enable_mpi=yes
ACX_C_PACKAGE([MPI],[mpi.h],,,
[AC_MSG_FAILURE([Required header mpi.h not found or not compilable.])
enable_MPI=no],[MPI_Waitall],[mpi mpich],,,
[AC_MSG_FAILURE([Cannot link C MPI programs.])
enable_MPI=no])
AS_IF([test -n "$FC" && test "X$FC" != "Xno"],
[ACX_FORTRAN_PACKAGE([MPI], [mpif.h],,,
[AC_MSG_FAILURE([Required include mpif.h not found or not compilable.])
enable_MPI=no],[mpi_waitall],
[mpi mpi_f90 mpi_f77 mpich],[[-lmpi_f77 -lmpi],[-lmpi]],,
[AC_MSG_FAILURE([Cannot link Fortran MPI programs.])
enable_MPI=no],[])])],
[enable_mpi=no])
AS_IF([test x"${enable_mpi}" = x"yes"],
[USE_MPI=yes])
HAVE_PARALLEL_NC4=0
......@@ -218,6 +236,7 @@ AC_SUBST([HAVE_PARALLEL_NC4])
AM_CONDITIONAL([USE_MPI],[test x"$USE_MPI" = xyes])
AM_CONDITIONAL([USE_PPM_CORE],[test $enable_ppm = yes])
AC_SUBST([USE_MPI])
AC_SUBST([ENABLE_MPI],[`test x"$enable_mpi" = xyes && echo true || echo false`])
# ----------------------------------------------------------------------
# Create the Fortran Interface via iso_c_binding module (Fortran 2003 Standard)
AC_ARG_ENABLE([iso-c-interface],
......@@ -307,40 +326,20 @@ AM_CONDITIONAL([USE_FC],[test -n "$FC" && test "X$FC" != "Xno" && test x$acx_cv_
dnl
AC_SUBST([CPPFLAGS])dnl
dnl
AC_ARG_VAR([BUILD_CFLAGS],
[append to CFLAGS during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE([CFLAGS="$CFLAGS${BUILD_CFLAGS+ $BUILD_CFLAGS}"])dnl
AM_SUBST_NOTMAKE([BUILD_CFLAGS])dnl
AC_ARG_VAR([BUILD_FCFLAGS],
[append to FCFLAGS during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE([FCFLAGS="$FCFLAGS${BUILD_FCFLAGS+ $BUILD_FCFLAGS}"])dnl
AM_SUBST_NOTMAKE([BUILD_FCFLAGS])dnl
AC_ARG_VAR([BUILD_LDFLAGS],
[append to LDFLAGS during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE([LDFLAGS="$LDFLAGS${BUILD_LDFLAGS+ $BUILD_LDFLAGS}"])dnl
AM_SUBST_NOTMAKE([BUILD_LDFLAGS])dnl
AC_ARG_VAR([BUILD_LIBS],
[append to LIBS during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE([LIBS="$LIBS${BUILD_LIBS+ $BUILD_LIBS}"])dnl
AM_SUBST_NOTMAKE([BUILD_LIBS])dnl
AC_ARG_VAR([BUILD_CC],
[replace CC with expansion of $BUILD_CC during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE([CC="${BUILD_CC-$CC}"])dnl
AM_SUBST_NOTMAKE([BUILD_CC])dnl
AC_ARG_VAR([BUILD_CXX],
[replace CXX with expansion of $BUILD_CXX during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE([CXX="${BUILD_CXX-$CXX}"])dnl
AM_SUBST_NOTMAKE([BUILD_CXX])dnl
AC_ARG_VAR([BUILD_FC],
[replace FC with expansion of $BUILD_FC during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE([FC="${BUILD_FC-$FC}"])dnl
AM_SUBST_NOTMAKE([BUILD_FC])dnl
AC_ARG_VAR([BUILD_F77],
[replace F77 with expansion of $BUILD_F77 during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE([F77="${BUILD_F77-$F77}"])dnl
AM_SUBST_NOTMAKE([BUILD_F77])dnl
m4_foreach([build_flag_var],[[BUILD_CFLAGS],[BUILD_FCFLAGS],[BUILD_LDFLAGS],[BUILD_LIBS],[BUILD_MPI_C_LIB],[BUILD_MPI_FC_LIB],[BUILD_C_INCLUDE],[BUILD_FC_INCLUDE]],
[AC_ARG_VAR(build_flag_var,
[append to ]m4_bpatsubst(build_flag_var, [BUILD_], [])[ during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE(m4_bpatsubst(build_flag_var, [BUILD_], [])[="$]m4_bpatsubst(build_flag_var, [BUILD_], [])[$]{build_flag_var+ $build_flag_var[}"])dnl
AM_SUBST_NOTMAKE(build_flag_var)])dnl
m4_foreach([build_tool_var],[[BUILD_CC],[BUILD_CXX],[BUILD_FC],[BUILD_F77]],
[AC_ARG_VAR(build_tool_var,
[replace ]m4_bpatsubst(build_tool_var, [BUILD_], [])[ with expansion of $]build_tool_var[ during build but not in configure phase])dnl
AC_CONFIG_COMMANDS_PRE(m4_bpatsubst(build_tool_var, [BUILD_], [])[="$]{build_tool_var-$[]m4_bpatsubst(build_tool_var, [BUILD_], [])}["])dnl
AM_SUBST_NOTMAKE(build_tool_var)])dnl
dnl
dnl
dnl
# Checks for compiler
COMPILER="$CC $CFLAGS"
AC_DEFINE_UNQUOTED(COMPILER, ["$COMPILER"], [Compiler])
......
......@@ -89,17 +89,26 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_assert_lang_is_fortran_variant.m4 \
$(top_srcdir)/m4/acx_c_package.m4 \
$(top_srcdir)/m4/acx_check_strptr_convert.m4 \
$(top_srcdir)/m4/acx_execinfo.m4 \
$(top_srcdir)/m4/acx_fortran_package.m4 \
$(top_srcdir)/m4/acx_lang_check_include.m4 \
$(top_srcdir)/m4/acx_lang_other_suffix_conftest.m4 \
$(top_srcdir)/m4/acx_lang_package.m4 \
$(top_srcdir)/m4/acx_option_search_libs.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_unset.m4 $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/starlink_fpp.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/ac_lang_program_fortran.m4 \
$(top_srcdir)/m4/acx_lang_fortran_check_include.m4 \
$(top_srcdir)/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
......@@ -270,6 +279,7 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
ENABLE_MPI = @ENABLE_MPI@
ENABLE_NC2 = @ENABLE_NC2@
ENABLE_NC4 = @ENABLE_NC4@
ENABLE_NETCDF = @ENABLE_NETCDF@
......@@ -317,6 +327,11 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MPIROOT = @MPIROOT@
MPI_C_INCLUDE = @MPI_C_INCLUDE@
MPI_C_LIB = @MPI_C_LIB@
MPI_FC_INCLUDE = @MPI_FC_INCLUDE@
MPI_FC_LIB = @MPI_FC_LIB@
MPI_LAUNCH = @MPI_LAUNCH@
NC_CONFIG = @NC_CONFIG@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
......
noinst_PROGRAMS=collectData collectDataNStreams
AM_CPPFLAGS = -I$(top_srcdir)/src $(YAXT_CFLAGS)
AM_FCFLAGS = $(FPP_INCOPT)$(top_srcdir)/src
AM_FCFLAGS = $(FPP_INCOPT)$(top_srcdir)/src $(MPI_FC_INCLUDE)
AM_CFLAGS = $(MPI_C_INCLUDE)
if USE_MPI
noinst_PROGRAMS+=compareResourcesArray
......@@ -15,14 +16,15 @@ endif
collectData_SOURCES=collectData.c
if USE_MPI
LDADD=$(top_builddir)/src/libcdipio.la
LDADD=$(top_builddir)/src/libcdipio.la $(MPI_C_LIB)
collectData2003_LDADD=$(top_builddir)/src/libcdipio.la $(MPI_FC_LIB)
else
LDADD=
LDADD=$(top_builddir)/src/libcdi.la
collectData2003_LDADD=$(top_builddir)/src/libcdi.la
endif
LDADD+=$(top_builddir)/src/libcdi.la
collectData2003_SOURCES=collectData2003.F90
collectDataNStreams_SOURCES=collectDataNStreams.c
collectDataNStreams_SOURCES = collectDataNStreams.c
compareResourcesArray_SOURCES=compareResourcesArray.c
compareResourcesArray_SOURCES = compareResourcesArray.c
......@@ -90,17 +90,26 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
$(top_srcdir)/m4/acx_assert_lang_is_fortran_variant.m4 \
$(top_srcdir)/m4/acx_c_package.m4 \
$(top_srcdir)/m4/acx_check_strptr_convert.m4 \
$(top_srcdir)/m4/acx_execinfo.m4 \
$(top_srcdir)/m4/acx_fortran_package.m4 \
$(top_srcdir)/m4/acx_lang_check_include.m4 \
$(top_srcdir)/m4/acx_lang_other_suffix_conftest.m4 \
$(top_srcdir)/m4/acx_lang_package.m4 \
$(top_srcdir)/m4/acx_option_search_libs.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/acx_sl_fc_mod_path_flag.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
$(top_srcdir)/m4/asx_unset.m4 $(top_srcdir)/m4/ax_pthread.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/starlink_fpp.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/asx_tr_arg.m4 $(top_srcdir)/m4/asx_unset.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/starlink_fpp.m4 \
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/ac_lang_program_fortran.m4 \
$(top_srcdir)/m4/acx_lang_fortran_check_include.m4 \
$(top_srcdir)/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
......@@ -114,23 +123,23 @@ PROGRAMS = $(noinst_PROGRAMS)
am_collectData_OBJECTS = collectData.$(OBJEXT)
collectData_OBJECTS = $(am_collectData_OBJECTS)
collectData_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
@USE_MPI_FALSE@collectData_DEPENDENCIES = \
@USE_MPI_FALSE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@collectData_DEPENDENCIES = \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdipio.la \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@ $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
am_collectData2003_OBJECTS = collectData2003.$(OBJEXT)
collectData2003_OBJECTS = $(am_collectData2003_OBJECTS)
collectData2003_LDADD = $(LDADD)
@USE_MPI_FALSE@collectData2003_DEPENDENCIES = \
@USE_MPI_FALSE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@collectData2003_DEPENDENCIES = \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdipio.la \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@ $(am__DEPENDENCIES_1)
am_collectDataNStreams_OBJECTS = collectDataNStreams.$(OBJEXT)
collectDataNStreams_OBJECTS = $(am_collectDataNStreams_OBJECTS)
collectDataNStreams_LDADD = $(LDADD)
......@@ -138,7 +147,7 @@ collectDataNStreams_LDADD = $(LDADD)
@USE_MPI_FALSE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@collectDataNStreams_DEPENDENCIES = \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdipio.la \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@ $(am__DEPENDENCIES_1)
am_compareResourcesArray_OBJECTS = compareResourcesArray.$(OBJEXT)
compareResourcesArray_OBJECTS = $(am_compareResourcesArray_OBJECTS)
compareResourcesArray_LDADD = $(LDADD)
......@@ -146,7 +155,7 @@ compareResourcesArray_LDADD = $(LDADD)
@USE_MPI_FALSE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@compareResourcesArray_DEPENDENCIES = \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdipio.la \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@ $(am__DEPENDENCIES_1)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -264,6 +273,7 @@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
ENABLE_MPI = @ENABLE_MPI@
ENABLE_NC2 = @ENABLE_NC2@
ENABLE_NC4 = @ENABLE_NC4@
ENABLE_NETCDF = @ENABLE_NETCDF@
......@@ -311,6 +321,11 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MPIROOT = @MPIROOT@
MPI_C_INCLUDE = @MPI_C_INCLUDE@
MPI_C_LIB = @MPI_C_LIB@
MPI_FC_INCLUDE = @MPI_FC_INCLUDE@
MPI_FC_LIB = @MPI_FC_LIB@
MPI_LAUNCH = @MPI_LAUNCH@
NC_CONFIG = @NC_CONFIG@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
......@@ -418,11 +433,14 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir)/src $(YAXT_CFLAGS)
AM_FCFLAGS = $(FPP_INCOPT)$(top_srcdir)/src $(am__append_2)
AM_FCFLAGS = $(FPP_INCOPT)$(top_srcdir)/src $(MPI_FC_INCLUDE) \
$(am__append_2)
AM_CFLAGS = $(MPI_C_INCLUDE)
collectData_SOURCES = collectData.c
@USE_MPI_FALSE@LDADD = $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@LDADD = $(top_builddir)/src/libcdipio.la \
@USE_MPI_TRUE@ $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@LDADD = $(top_builddir)/src/libcdipio.la $(MPI_C_LIB)
@USE_MPI_FALSE@collectData2003_LDADD = $(top_builddir)/src/libcdi.la
@USE_MPI_TRUE@collectData2003_LDADD = $(top_builddir)/src/libcdipio.la $(MPI_FC_LIB)
collectData2003_SOURCES = collectData2003.F90
collectDataNStreams_SOURCES = collectDataNStreams.c
compareResourcesArray_SOURCES = compareResourcesArray.c
......
......@@ -4,7 +4,6 @@
#include <stdio.h>
#ifdef USE_MPI
#include <mpi.h>
#include <yaxt.h>
#include "cdi.h"
......@@ -223,23 +222,20 @@ static void modelRun ( MPI_Comm comm )
return;
}
#endif
int main (int argc, char *argv[])
int main (int argc, char *argv[])
{
#ifdef USE_MPI
int sizeGlob, pioNamespace;
MPI_Comm commGlob, commModel;
MPI_Init(&argc, &argv);
MPI_Init(&argc, &argv);
commGlob = MPI_COMM_WORLD;
xt_initialize(commGlob);
xmpi ( MPI_Comm_set_errhandler ( commGlob, MPI_ERRORS_RETURN ));
xmpi ( MPI_Comm_size ( commGlob, &sizeGlob ));
xmpi ( MPI_Comm_size ( commGlob, &sizeGlob ));
if ( sizeGlob != 1 )
if ( sizeGlob != 1 )
xabort ( "test transition of resource array only with 1 PE." );
if ( nProcsIO != 1 )
xabort ( "bad distribution of tasks on PEs" );