diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index 0585b3ceb9..9adb03ef8c 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -19,6 +19,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION "was built for newer macOS version" "warning generated" "warnings generated" + "warning: template parameter ... is not used in declaring the parameter types of function template" ) list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE ".*/thirdparty/.*" diff --git a/bindings/C/adios2/c/adios2_c_adios.cpp b/bindings/C/adios2/c/adios2_c_adios.cpp index 856dc7853f..dd658e9b4b 100644 --- a/bindings/C/adios2/c/adios2_c_adios.cpp +++ b/bindings/C/adios2/c/adios2_c_adios.cpp @@ -42,13 +42,8 @@ adios2::ArrayOrdering adios2_ToArrayOrdering(const adios2_arrayordering Corder) } adios2_adios *adios2_init_config_glue_serial(const char *config_file, - const adios2_debug_mode debug_mode, const char *host_language) { - // The debug_mode argument is no longer used, but kept in the public - // API for compatibility. - static_cast(debug_mode); - adios2_adios *adios = nullptr; try { @@ -67,13 +62,23 @@ adios2_adios *adios2_init_config_glue_serial(const char *config_file, adios2_adios *adios2_init_serial() { - return adios2_init_config_glue_serial("", adios2_debug_mode_off, "C"); + return adios2_init_config_glue_serial("", "C"); +} + +adios2_adios *adios2_init_serial_debug(adios2_debug_mode) +{ + return adios2_init_serial(); } adios2_adios *adios2_init_config_serial(const char *config_file) { - return adios2_init_config_glue_serial(config_file, adios2_debug_mode_off, - "C"); + return adios2_init_config_glue_serial(config_file, "C"); +} + +adios2_adios *adios2_init_config_serial_debug(const char *config_file, + adios2_debug_mode) +{ + return adios2_init_config_serial(config_file); } adios2_io *adios2_declare_io(adios2_adios *adios, const char *name) diff --git a/bindings/C/adios2/c/adios2_c_adios.h b/bindings/C/adios2/c/adios2_c_adios.h index 3be6fd2a6f..676e024196 100644 --- a/bindings/C/adios2/c/adios2_c_adios.h +++ b/bindings/C/adios2/c/adios2_c_adios.h @@ -22,9 +22,9 @@ extern "C" { #endif #if ADIOS2_USE_MPI -#define adios2_init(comm, debug_mode) adios2_init_mpi(comm) -#define adios2_init_config(config_file, comm, debug_mode) \ - adios2_init_config_mpi(config_file, comm) +#define adios2_init(comm, debug) adios2_init_mpi_debug(comm, debug) +#define adios2_init_config(config_file, comm, debug) \ + adios2_init_config_mpi_debug(config_file, comm, debug) /** * Starting point for MPI apps. Creates an ADIOS handler. @@ -34,6 +34,9 @@ extern "C" { */ adios2_adios *adios2_init_mpi(MPI_Comm comm); +ADIOS2_DEPRECATED +adios2_adios *adios2_init_mpi_debug(MPI_Comm comm, adios2_debug_mode); + /** * Starting point for MPI apps. Creates an ADIOS handler allowing a runtime * config file. @@ -44,10 +47,15 @@ adios2_adios *adios2_init_mpi(MPI_Comm comm); * @return success: handler, failure: NULL */ adios2_adios *adios2_init_config_mpi(const char *config_file, MPI_Comm comm); + +ADIOS2_DEPRECATED +adios2_adios *adios2_init_config_mpi_debug(const char *config_file, + MPI_Comm comm, adios2_debug_mode); + #else -#define adios2_init(debug_mode) adios2_init_serial() -#define adios2_init_config(config_file, debug_mode) \ - adios2_init_config_serial(config_file) +#define adios2_init(debug) adios2_init_serial_debug(debug) +#define adios2_init_config(config_file, debug) \ + adios2_init_config_serial_debug(config_file, debug) #endif /** @@ -57,6 +65,9 @@ adios2_adios *adios2_init_config_mpi(const char *config_file, MPI_Comm comm); */ adios2_adios *adios2_init_serial(void); +ADIOS2_DEPRECATED +adios2_adios *adios2_init_serial_debug(adios2_debug_mode); + /** * Initialize an ADIOS struct pointer handler in a serial, non-MPI application. * Doesn't require a runtime config file. @@ -64,6 +75,10 @@ adios2_adios *adios2_init_serial(void); */ adios2_adios *adios2_init_config_serial(const char *config_file); +ADIOS2_DEPRECATED +adios2_adios *adios2_init_config_serial_debug(const char *config_file, + adios2_debug_mode); + /** * Declares a new io handler * @param adios owner the io handler diff --git a/bindings/C/adios2/c/adios2_c_adios_mpi.cpp b/bindings/C/adios2/c/adios2_c_adios_mpi.cpp index 149799ff31..8df28532e5 100644 --- a/bindings/C/adios2/c/adios2_c_adios_mpi.cpp +++ b/bindings/C/adios2/c/adios2_c_adios_mpi.cpp @@ -17,7 +17,6 @@ extern "C" { // to be called from other languages, hidden from the public apis adios2_adios *adios2_init_config_glue_mpi(const char *config_file, MPI_Comm comm, - const adios2_debug_mode debug_mode, const char *host_language) { adios2_adios *adios = nullptr; @@ -39,13 +38,23 @@ adios2_adios *adios2_init_config_glue_mpi(const char *config_file, adios2_adios *adios2_init_mpi(MPI_Comm comm) { - return adios2_init_config_glue_mpi("", comm, adios2_debug_mode_off, "C"); + return adios2_init_config_glue_mpi("", comm, "C"); +} + +adios2_adios *adios2_init_mpi_debug(MPI_Comm comm, adios2_debug_mode) +{ + return adios2_init_mpi(comm); } adios2_adios *adios2_init_config_mpi(const char *config_file, MPI_Comm comm) { - return adios2_init_config_glue_mpi(config_file, comm, adios2_debug_mode_off, - "C"); + return adios2_init_config_glue_mpi(config_file, comm, "C"); +} + +adios2_adios *adios2_init_config_mpi_debug(const char *config_file, + MPI_Comm comm, adios2_debug_mode) +{ + return adios2_init_config_mpi(config_file, comm); } } // end extern C diff --git a/bindings/C/adios2/c/adios2_c_types.h b/bindings/C/adios2/c/adios2_c_types.h index 266ac86fa6..063ee3cece 100644 --- a/bindings/C/adios2/c/adios2_c_types.h +++ b/bindings/C/adios2/c/adios2_c_types.h @@ -40,8 +40,7 @@ typedef enum adios2_error_none = 0, /** - * user input error, on when adios2_debug_mode_on is passed to adios2_init - * or adios2_init_config + * user input error */ adios2_error_invalid_argument = 1, @@ -62,6 +61,7 @@ typedef enum adios2_true = 1, } adios2_bool; +/* DEPRECATED: Debug mode will be removed in a future release */ typedef enum { adios2_debug_mode_off = 0, diff --git a/bindings/CXX11/adios2.h b/bindings/CXX11/adios2.h index 4e5d97de3a..807363cdaa 100644 --- a/bindings/CXX11/adios2.h +++ b/bindings/CXX11/adios2.h @@ -15,13 +15,11 @@ #include "adios2/common/ADIOSMacros.h" #include "adios2/common/ADIOSTypes.h" +// DEPRECATED: Debug mode will be removed in a future release namespace adios2 { - -// adios alias values and types. These not used internally and deprecated. constexpr bool DebugON = true; constexpr bool DebugOFF = false; - } // end namespace adios2 #include "adios2/cxx11/ADIOS.h" diff --git a/bindings/CXX11/adios2/cxx11/ADIOS.cpp b/bindings/CXX11/adios2/cxx11/ADIOS.cpp index 3b39dbb6dd..48b2c60f9f 100644 --- a/bindings/CXX11/adios2/cxx11/ADIOS.cpp +++ b/bindings/CXX11/adios2/cxx11/ADIOS.cpp @@ -15,17 +15,14 @@ namespace adios2 { -ADIOS::ADIOS(const std::string &configFile, const bool debugMode) +ADIOS::ADIOS(const std::string &configFile) : m_ADIOS(std::make_shared(configFile, "C++")) { } -ADIOS::ADIOS(const char *configFile) : ADIOS(std::string(configFile), "C++") {} +ADIOS::ADIOS() : ADIOS("", "C++") {} -ADIOS::ADIOS(const bool debugMode) : ADIOS("", "C++") {} - -ADIOS::ADIOS(const std::string &configFile, const std::string &hostLanguage, - const bool debugMode) +ADIOS::ADIOS(const std::string &configFile, const std::string &hostLanguage) : m_ADIOS(std::make_shared(configFile, hostLanguage)) { } diff --git a/bindings/CXX11/adios2/cxx11/ADIOS.h b/bindings/CXX11/adios2/cxx11/ADIOS.h index 72a3c4173c..3fd4da6b47 100644 --- a/bindings/CXX11/adios2/cxx11/ADIOS.h +++ b/bindings/CXX11/adios2/cxx11/ADIOS.h @@ -14,6 +14,7 @@ #include #include #include +#include #include "IO.h" #include "Operator.h" @@ -41,15 +42,23 @@ class ADIOS { public: + template + using enable_if_bool = + typename std::enable_if::value, bool>::type; + #if ADIOS2_USE_MPI /** * Starting point for MPI apps. Creates an ADIOS object. * MPI Collective Operation as it call MPI_Comm_dup * @param comm defines domain scope from application - * @param debugMode is deprecated and has no effect on library behavior * @exception std::invalid_argument if user input is incorrect */ - ADIOS(MPI_Comm comm, const bool debugMode = true); + ADIOS(MPI_Comm comm); + + template Enable = true> + ADIOS2_DEPRECATED ADIOS(MPI_Comm comm, TDebugMode) : ADIOS(comm) + { + } /** * Starting point for MPI apps. Creates an ADIOS object allowing a @@ -58,11 +67,16 @@ class ADIOS * configFile contents * @param configFile runtime config file * @param comm defines domain scope from application - * @param debugMode is deprecated and has no effect on library behavior * @exception std::invalid_argument if user input is incorrect */ - ADIOS(const std::string &configFile, MPI_Comm comm, - const bool debugMode = true); + ADIOS(const std::string &configFile, MPI_Comm comm); + + template Enable = true> + ADIOS2_DEPRECATED ADIOS(const std::string &configFile, MPI_Comm comm, + TDebugMode) + : ADIOS(configFile, comm) + { + } /** extra constructor for R and other languages that use the * public C++ API but has data in column-major. Pass "" for configfile @@ -74,46 +88,41 @@ class ADIOS * e.g. adios2::ADIOS("", comm, "Fortran", false); */ ADIOS(const std::string &configFile, MPI_Comm comm, - const std::string &hostLanguage, const bool debugMode); -#else - // Client code that does not enable ADIOS2_USE_MPI may accidentally - // try to pass a MPI_Comm instance to our constructor. If the type - // the MPI library uses to implement MPI_Comm happens to be convertible - // to one of the types offered by our serial constructors (e.g. 'bool'), - // the invocation will appear to succeed but will ignore the - // communicator passed. Add explicitly deleted constructors that have - // better conversions for common MPI_Comm types. - - // openmpi uses 'ompi_communicator_t*' for MPI_Comm - ADIOS(void *define_ADIOS2_USE_MPI_to_use_MPI_constructor) = delete; - - // mpich uses 'int' for MPI_Comm - ADIOS(int define_ADIOS2_USE_MPI_to_use_MPI_constructor) = delete; + const std::string &hostLanguage); + + template Enable = true> + ADIOS2_DEPRECATED ADIOS(const std::string &configFile, MPI_Comm comm, + const std::string &hostLanguage, TDebugMode) + : ADIOS(configFile, comm, hostLanguage) + { + } + #endif /** * Starting point for non-MPI serial apps. Creates an ADIOS object allowing * a runtime config file. * @param configFile runtime config file - * @param debugMode is deprecated and has no effect on library behavior * @exception std::invalid_argument if user input is incorrect */ - ADIOS(const std::string &configFile, const bool debugMode = true); + ADIOS(const std::string &configFile); - /** - * Starting point for non-MPI serial apps. Creates an ADIOS object allowing - * a runtime config file. - * @param configFile runtime config file - * @exception std::invalid_argument if user input is incorrect - */ - ADIOS(const char *configFile); + template Enable = true> + ADIOS2_DEPRECATED ADIOS(const std::string &configFile, TDebugMode) + : ADIOS(configFile) + { + } /** * Starting point for non-MPI apps. Creates an ADIOS object - * @param debugMode is deprecated and has no effect on library behavior * @exception std::invalid_argument if user input is incorrect */ - ADIOS(const bool debugMode = true); + ADIOS(); + + template Enable = true> + ADIOS2_DEPRECATED ADIOS(TDebugMode) : ADIOS() + { + } /** extra constructor for R and other languages that use the * public C++ API but has data in column-major. Pass "" for configfile @@ -124,8 +133,14 @@ class ADIOS * treat all arrays column-major * e.g. adios2::ADIOS("", "Fortran", false); */ - ADIOS(const std::string &configFile, const std::string &hostLanguage, - const bool debugMode); + ADIOS(const std::string &configFile, const std::string &hostLanguage); + + template Enable = true> + ADIOS2_DEPRECATED ADIOS(const std::string &configFile, + const std::string &hostLanguage, TDebugMode) + : ADIOS(configFile, hostLanguage) + { + } /** object inspection true: valid object, false: invalid object */ explicit operator bool() const noexcept; diff --git a/bindings/CXX11/adios2/cxx11/ADIOSMPI.cpp b/bindings/CXX11/adios2/cxx11/ADIOSMPI.cpp index 16d315c339..541a57753d 100644 --- a/bindings/CXX11/adios2/cxx11/ADIOSMPI.cpp +++ b/bindings/CXX11/adios2/cxx11/ADIOSMPI.cpp @@ -12,16 +12,16 @@ namespace adios2 { -ADIOS::ADIOS(const std::string &configFile, MPI_Comm comm, const bool debugMode) +ADIOS::ADIOS(const std::string &configFile, MPI_Comm comm) : m_ADIOS(std::make_shared(configFile, helper::CommDupMPI(comm), "C++")) { } -ADIOS::ADIOS(MPI_Comm comm, const bool debugMode) : ADIOS("", comm) {} +ADIOS::ADIOS(MPI_Comm comm) : ADIOS("", comm) {} ADIOS::ADIOS(const std::string &configFile, MPI_Comm comm, - const std::string &hostLanguage, const bool debugMode = true) + const std::string &hostLanguage) : m_ADIOS(std::make_shared(configFile, helper::CommDupMPI(comm), hostLanguage)) { diff --git a/bindings/Fortran/f2c/adios2_f2c_adios.cpp b/bindings/Fortran/f2c/adios2_f2c_adios.cpp index 6d777802a5..5129208458 100644 --- a/bindings/Fortran/f2c/adios2_f2c_adios.cpp +++ b/bindings/Fortran/f2c/adios2_f2c_adios.cpp @@ -15,28 +15,24 @@ extern "C" { #endif // this function is not exposed in the public APIs -extern adios2_adios * -adios2_init_config_glue_serial(const char *config_file, - const adios2_debug_mode debug_mode, - const char *host_language); +extern adios2_adios *adios2_init_config_glue_serial(const char *config_file, + const char *host_language); void FC_GLOBAL(adios2_init_config_serial_f2c, ADIOS2_INIT_CONFIG_SERIAL_F2C)(adios2_adios **adios, const char *config_file, - const int *debug_mode, int *ierr) + int *ierr) { - *adios = adios2_init_config_glue_serial( - config_file, static_cast(*debug_mode), "Fortran"); + *adios = adios2_init_config_glue_serial(config_file, "Fortran"); *ierr = (*adios == NULL) ? static_cast(adios2_error_exception) : static_cast(adios2_error_none); } void FC_GLOBAL(adios2_init_serial_f2c, - ADIOS2_INIT_SERIAL_F2C)(adios2_adios **adios, - const int *debug_mode, int *ierr) + ADIOS2_INIT_SERIAL_F2C)(adios2_adios **adios, int *ierr) { FC_GLOBAL(adios2_init_config_serial_f2c, ADIOS2_INIT_CONFIG_SERIAL_F2C) - (adios, "", debug_mode, ierr); + (adios, "", ierr); } void FC_GLOBAL(adios2_declare_io_f2c, diff --git a/bindings/Fortran/f2c/adios2_f2c_adios_mpi.cpp b/bindings/Fortran/f2c/adios2_f2c_adios_mpi.cpp index 4f0cbefb9d..0677d76e08 100644 --- a/bindings/Fortran/f2c/adios2_f2c_adios_mpi.cpp +++ b/bindings/Fortran/f2c/adios2_f2c_adios_mpi.cpp @@ -12,29 +12,26 @@ extern "C" { // this function is not exposed in the public APIs -extern adios2_adios * -adios2_init_config_glue_mpi(const char *config_file, MPI_Comm comm, - const adios2_debug_mode debug_mode, - const char *host_language); +extern adios2_adios *adios2_init_config_glue_mpi(const char *config_file, + MPI_Comm comm, + const char *host_language); void FC_GLOBAL(adios2_init_config_mpi_f2c, ADIOS2_INIT_CONFIG_MPI_F2C)(adios2_adios **adios, const char *config_file, - MPI_Fint *comm, - const int *debug_mode, int *ierr) + MPI_Fint *comm, int *ierr) { - *adios = adios2_init_config_glue_mpi( - config_file, MPI_Comm_f2c(*comm), - static_cast(*debug_mode), "Fortran"); + *adios = adios2_init_config_glue_mpi(config_file, MPI_Comm_f2c(*comm), + "Fortran"); *ierr = (*adios == NULL) ? static_cast(adios2_error_exception) : static_cast(adios2_error_none); } -void FC_GLOBAL(adios2_init_mpi_f2c, - ADIOS2_INIT_MPI_F2C)(adios2_adios **adios, MPI_Fint *comm, - const int *debug_mode, int *ierr) +void FC_GLOBAL(adios2_init_mpi_f2c, ADIOS2_INIT_MPI_F2C)(adios2_adios **adios, + MPI_Fint *comm, + int *ierr) { FC_GLOBAL(adios2_init_config_mpi_f2c, ADIOS2_INIT_CONFIG_MPI_F2C) - (adios, "", comm, debug_mode, ierr); + (adios, "", comm, ierr); } } diff --git a/bindings/Fortran/modules/adios2_adios_init_mod.F90 b/bindings/Fortran/modules/adios2_adios_init_mod.F90 index 010b6e8461..012568d597 100644 --- a/bindings/Fortran/modules/adios2_adios_init_mod.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_mod.F90 @@ -7,71 +7,75 @@ ! module adios2_adios_init_mod - #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES use adios2_parameters_mod implicit none interface adios2_init - - module subroutine adios2_init_serial(adios, adios2_debug_mode, ierr) + module subroutine adios2_init_serial(adios, ierr) type(adios2_adios), intent(out) :: adios - logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_debug_serial(adios, ierr) + module subroutine adios2_init_debug_serial(adios, adios2_debug_mode, ierr) type(adios2_adios), intent(out) :: adios + logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_config_serial(adios, config_file, adios2_debug_mode, ierr) + module subroutine adios2_init_config_serial(adios, config_file, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file - logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_config_debug_serial(adios, config_file, ierr) + module subroutine adios2_init_config_debug_serial(adios, config_file, adios2_debug_mode, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file + logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr end subroutine -# ifdef ADIOS2_HAVE_MPI_F - - module subroutine adios2_init_mpi(adios, comm, adios2_debug_mode, ierr) +#ifdef ADIOS2_HAVE_MPI_F + module subroutine adios2_init_mpi(adios, comm, ierr) type(adios2_adios), intent(out) :: adios integer, intent(in) :: comm - logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_debug_mpi(adios, comm, ierr) + module subroutine adios2_init_debug_mpi(adios, comm, adios2_debug_mode, ierr) type(adios2_adios), intent(out) :: adios integer, intent(in) :: comm + logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_config_mpi(adios, config_file, comm, adios2_debug_mode, ierr) + module subroutine adios2_init_config_mpi(adios, config_file, comm, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file integer, intent(in) :: comm - logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_config_debug_mpi(adios, config_file, comm, ierr) + module subroutine adios2_init_config_debug_mpi(adios, config_file, comm, adios2_debug_mode, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file integer, intent(in) :: comm + logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr end subroutine -# endif - +#endif end interface - #else use adios2_adios_init_serial_mod -# ifdef ADIOS2_HAVE_MPI_F + +#ifdef ADIOS2_HAVE_MPI_F use adios2_adios_init_mpi_mod -# endif +#endif /*ADIOS2_HAVE_MPI_F*/ +#endif /*ADIOS2_HAVE_FORTRAN_SUBMODULES*/ -#endif +#if defined(__GFORTRAN__) && defined(__GNUC__) && (__GNUC__ >= 11) +!GCC$ ATTRIBUTES DEPRECATED :: adios2_init_debug_serial, adios2_init_config_debug_serial +#endif /*DEPRECATED*/ +#ifdef ADIOS2_HAVE_MPI_F +#if defined(__GFORTRAN__) && defined(__GNUC__) && (__GNUC__ >= 11) +!GCC$ ATTRIBUTES DEPRECATED :: adios2_init_debug_mpi, adios2_init_config_debug_mpi +#endif /*DEPRECATED*/ +#endif /*ADIOS2_HAVE_MPI_F*/ end module diff --git a/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 b/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 index 88495ec4f8..07e49cf5cd 100644 --- a/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 @@ -12,6 +12,8 @@ # define ADIOS2_MODULE_PROCEDURE #endif +#define UNUSED_ARG(x) if (.false.) print*,loc(x) + #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES submodule ( adios2_adios_init_mod ) adios2_adios_init_mpi_smod #else @@ -35,52 +37,49 @@ module adios2_adios_init_mpi_mod contains ADIOS2_MODULE_PROCEDURE subroutine adios2_init_mpi( & - adios, comm, adios2_debug_mode, ierr) + adios, comm, ierr) type(adios2_adios), intent(out) :: adios integer, intent(in) :: comm - logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr - call adios2_init_config_mpi(adios, char(0), comm, adios2_debug_mode, ierr) - + call adios2_init_config_mpi(adios, char(0), comm, ierr) end subroutine - ADIOS2_MODULE_PROCEDURE subroutine adios2_init_debug_mpi(adios, comm, ierr) + ADIOS2_MODULE_PROCEDURE subroutine adios2_init_debug_mpi( & + adios, comm, adios2_debug_mode, ierr) type(adios2_adios), intent(out) :: adios integer, intent(in) :: comm + logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr - call adios2_init_config_mpi(adios, char(0), comm, .true., ierr) - + UNUSED_ARG(adios2_debug_mode) + call adios2_init_mpi(adios, comm, ierr) end subroutine ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_mpi( & - adios, config_file, comm, adios2_debug_mode, ierr) + adios, config_file, comm, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file integer, intent(in) :: comm - logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr ! local - integer debug_mode - debug_mode = adios2_LogicalToInt(adios2_debug_mode) call adios2_init_config_mpi_f2c(adios%f2c, & TRIM(ADJUSTL(config_file))//char(0), & - comm, debug_mode, ierr) + comm, ierr) if( ierr == 0 ) adios%valid = .true. - end subroutine ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_debug_mpi( & - adios, config_file, comm, ierr) + adios, config_file, comm, adios2_debug_mode, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file integer, intent(in) :: comm + logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr - call adios2_init_config_mpi(adios, config_file, comm, .true., ierr) - + UNUSED_ARG(adios2_debug_mode) + call adios2_init_config_mpi(adios, config_file, comm, ierr) end subroutine #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES diff --git a/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 b/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 index 217850cb24..baf00403fd 100644 --- a/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 @@ -12,6 +12,8 @@ # define ADIOS2_MODULE_PROCEDURE #endif +#define UNUSED_ARG(x) if (.false.) print*,loc(x) + #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES submodule ( adios2_adios_init_mod ) adios2_adios_init_serial_smod #else @@ -35,46 +37,43 @@ module adios2_adios_init_serial_mod contains ADIOS2_MODULE_PROCEDURE subroutine adios2_init_serial( & - adios, adios2_debug_mode, ierr) + adios, ierr) type(adios2_adios), intent(out) :: adios - logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr - call adios2_init_config_serial(adios, char(0), adios2_debug_mode, ierr) - + call adios2_init_config_serial(adios, char(0), ierr) end subroutine - ADIOS2_MODULE_PROCEDURE subroutine adios2_init_debug_serial(adios, ierr) + ADIOS2_MODULE_PROCEDURE subroutine adios2_init_debug_serial( & + adios, adios2_debug_mode, ierr) type(adios2_adios), intent(out) :: adios + logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr - call adios2_init_config_serial(adios, char(0), .true., ierr) - + UNUSED_ARG(adios2_debug_mode) + call adios2_init_serial(adios, ierr) end subroutine ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_serial( & - adios, config_file, adios2_debug_mode, ierr) + adios, config_file, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file - logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr ! local - integer debug_mode - debug_mode = adios2_LogicalToInt(adios2_debug_mode) - call adios2_init_config_serial_f2c(adios%f2c, config_file, debug_mode, ierr) + call adios2_init_config_serial_f2c(adios%f2c, config_file, ierr) if( ierr == 0 ) adios%valid = .true. - end subroutine ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_debug_serial( & - adios, config_file, ierr) + adios, config_file, adios2_debug_mode, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file + logical, intent(in) :: adios2_debug_mode integer, intent(out) :: ierr - call adios2_init_config_serial(adios, config_file, .true., ierr) - + UNUSED_ARG(adios2_debug_mode) + call adios2_init_config_serial(adios, config_file, ierr) end subroutine #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES diff --git a/bindings/Fortran/modules/adios2_parameters_mod.f90 b/bindings/Fortran/modules/adios2_parameters_mod.f90 index 6be4deb2d9..dbdccfe669 100644 --- a/bindings/Fortran/modules/adios2_parameters_mod.f90 +++ b/bindings/Fortran/modules/adios2_parameters_mod.f90 @@ -11,7 +11,7 @@ module adios2_parameters_mod implicit none - ! Debug mode + ! DEPRECATED Debug mode logical, parameter :: adios2_debug_mode_on = .true. logical, parameter :: adios2_debug_mode_off = .false. diff --git a/bindings/Matlab/adiosopenc.c b/bindings/Matlab/adiosopenc.c index a0e18a2eb7..82f79723ac 100644 --- a/bindings/Matlab/adiosopenc.c +++ b/bindings/Matlab/adiosopenc.c @@ -147,7 +147,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) /********************************************************/ /* Open ADIOS file now and get variables and attributes */ - adiosobj = adios2_init(adios2_debug_mode_on); + adiosobj = adios2_init(); group = adios2_declare_io(adiosobj, "matlabiogroup"); // name is arbitrary fp = adios2_open(group, fname, adios2_mode_read); if (fp == NULL) diff --git a/bindings/Python/py11ADIOS.cpp b/bindings/Python/py11ADIOS.cpp index 88123558e2..bdb9113b4d 100644 --- a/bindings/Python/py11ADIOS.cpp +++ b/bindings/Python/py11ADIOS.cpp @@ -15,12 +15,12 @@ namespace adios2 namespace py11 { -ADIOS::ADIOS(const std::string &configFile, const bool debugMode) +ADIOS::ADIOS(const std::string &configFile) : m_ADIOS(std::make_shared(configFile, "Python")) { } -ADIOS::ADIOS(const bool debugMode) : ADIOS("", "Python") {} +ADIOS::ADIOS() : m_ADIOS(std::make_shared("", "Python")) {} ADIOS::operator bool() const noexcept { return m_ADIOS ? true : false; } diff --git a/bindings/Python/py11ADIOS.h b/bindings/Python/py11ADIOS.h index c46d742357..195d9aeded 100644 --- a/bindings/Python/py11ADIOS.h +++ b/bindings/Python/py11ADIOS.h @@ -29,12 +29,11 @@ class ADIOS public: #if ADIOS2_USE_MPI - ADIOS(const std::string &configFile, MPI4PY_Comm comm, - const bool debugMode = true); - ADIOS(MPI4PY_Comm comm, const bool debugMode = true); + ADIOS(const std::string &configFile, MPI4PY_Comm comm); + ADIOS(MPI4PY_Comm comm); #endif - ADIOS(const std::string &configFile, const bool debugMode = true); - ADIOS(const bool debugMode); + ADIOS(const std::string &configFile); + ADIOS(); ~ADIOS() = default; /** object inspection true: valid object, false: invalid object */ diff --git a/bindings/Python/py11ADIOSMPI.cpp b/bindings/Python/py11ADIOSMPI.cpp index 7c09732fcd..1d89f8492b 100644 --- a/bindings/Python/py11ADIOSMPI.cpp +++ b/bindings/Python/py11ADIOSMPI.cpp @@ -14,14 +14,13 @@ namespace adios2 namespace py11 { -ADIOS::ADIOS(const std::string &configFile, MPI4PY_Comm mpiComm, - const bool debugMode) +ADIOS::ADIOS(const std::string &configFile, MPI4PY_Comm mpiComm) : m_ADIOS(std::make_shared( configFile, helper::CommDupMPI(mpiComm), "Python")) { } -ADIOS::ADIOS(MPI4PY_Comm mpiComm, const bool debugMode) : ADIOS("", mpiComm) {} +ADIOS::ADIOS(MPI4PY_Comm mpiComm) : ADIOS("", mpiComm) {} } // end namespace py11 } // end namespace adios2 diff --git a/bindings/Python/py11glue.cpp b/bindings/Python/py11glue.cpp index 791451ff6c..60a7cf39af 100644 --- a/bindings/Python/py11glue.cpp +++ b/bindings/Python/py11glue.cpp @@ -113,8 +113,6 @@ adios2::py11::File OpenConfig(const std::string &name, const std::string mode, PYBIND11_MODULE(ADIOS2_PYTHON_MODULE_NAME, m) { - m.attr("DebugON") = true; - m.attr("DebugOFF") = false; m.attr("ConstantDims") = true; m.attr("VariableDims") = false; m.attr("LocalValueDim") = adios2::LocalValueDim; @@ -231,24 +229,21 @@ PYBIND11_MODULE(ADIOS2_PYTHON_MODULE_NAME, m) const bool opBool = adios ? true : false; return opBool; }) - .def(pybind11::init(), - "adios2 module starting point " - "non-MPI, constructs an ADIOS class " - "object", - pybind11::arg("debugMode") = true) - .def(pybind11::init(), + .def(pybind11::init(), "adios2 module starting point " + "non-MPI, constructs an ADIOS class " + "object") + .def(pybind11::init(), "adios2 module starting point non-MPI, constructs an ADIOS class " "object", - pybind11::arg("configFile"), pybind11::arg("debugMode") = true) + pybind11::arg("configFile")) #if ADIOS2_USE_MPI - .def(pybind11::init(), + .def(pybind11::init(), "adios2 module starting point, constructs an ADIOS class object", - pybind11::arg("comm"), pybind11::arg("debugMode") = true) + pybind11::arg("comm")) .def(pybind11::init(), + const adios2::py11::MPI4PY_Comm>(), "adios2 module starting point, constructs an ADIOS class object", - pybind11::arg("configFile"), pybind11::arg("comm"), - pybind11::arg("debugMode") = true) + pybind11::arg("configFile"), pybind11::arg("comm")) #endif .def("DeclareIO", &adios2::py11::ADIOS::DeclareIO, "spawn IO object component returning a IO object with a unique " diff --git a/cmake/install/post/adios2-config-dummy/foo.c b/cmake/install/post/adios2-config-dummy/foo.c index d55b974a35..8e90505d0c 100644 --- a/cmake/install/post/adios2-config-dummy/foo.c +++ b/cmake/install/post/adios2-config-dummy/foo.c @@ -11,9 +11,9 @@ void foo(void) { #ifdef WITH_ADIOS2 #if ADIOS2_USE_MPI - adios2_adios *ctx = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *ctx = adios2_init_mpi(MPI_COMM_WORLD); #else - adios2_adios *ctx = adios2_init(adios2_debug_mode_on); + adios2_adios *ctx = adios2_init_serial(); #endif #endif } diff --git a/docs/user_guide/source/api_full/c.rst b/docs/user_guide/source/api_full/c.rst index cd6173be07..f246f5b8bc 100644 --- a/docs/user_guide/source/api_full/c.rst +++ b/docs/user_guide/source/api_full/c.rst @@ -33,8 +33,7 @@ Each error will issue a more detailed description in the standard error output: adios2_error_none = 0, /** - * user input error, on when adios2_debug_mode_on is passed to adios2_init - * or adios2_init_config + * user input error */ adios2_error_invalid_argument = 1, diff --git a/docs/user_guide/source/api_full/fortran.rst b/docs/user_guide/source/api_full/fortran.rst index 6521f8a898..a885173ef3 100644 --- a/docs/user_guide/source/api_full/fortran.rst +++ b/docs/user_guide/source/api_full/fortran.rst @@ -115,10 +115,6 @@ ADIOS2 Fortran bindings handlers are mapped 1-to-1 to the ADIOS2 components desc ! Optional runtime configuration file (*.xml), see Runtime Configuration Files character*(*), intent(in) :: config_file - ! .true. (adios2_debug_mode_on): enable extra user input checks-> recommended - ! .false. (adios2_debug_mode_of): disable extra user input checks - logical, intent(in):: adios2_debug_mode - ! error code integer, intent(out) :: ierr diff --git a/examples/experimental/runtimeconfig/hello/helloBPWriterXML.py b/examples/experimental/runtimeconfig/hello/helloBPWriterXML.py index 2d81dd0bd9..688fb51c11 100644 --- a/examples/experimental/runtimeconfig/hello/helloBPWriterXML.py +++ b/examples/experimental/runtimeconfig/hello/helloBPWriterXML.py @@ -20,7 +20,7 @@ Nx = myArray.size # ADIOS config file, MPI communicator, debug mode -adios = adios2.ADIOS("helloBPWriter.xml", comm, adios2.DebugON) +adios = adios2.ADIOS("helloBPWriter.xml", comm) # ADIOS IO, name must be the same as in helloBPWriter.xml for runtime settings bpIO = adios.DeclareIO("BPFile_N2N") diff --git a/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.py b/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.py index 0373d1e672..72c1751b23 100644 --- a/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.py +++ b/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.py @@ -15,7 +15,7 @@ Nx = myArray.size # ADIOS config file, debug mode -adios = adios2.ADIOS("helloBPWriter.xml", adios2.DebugON) +adios = adios2.ADIOS("helloBPWriter.xml") # ADIOS IO, name must be the same as in helloBPWriter.xml for runtime settings bpIO = adios.DeclareIO("BPFile_N2N") diff --git a/examples/hello/bpFWriteCRead/FReader.f90 b/examples/hello/bpFWriteCRead/FReader.f90 index 67e0f7d461..f45acd4bab 100644 --- a/examples/hello/bpFWriteCRead/FReader.f90 +++ b/examples/hello/bpFWriteCRead/FReader.f90 @@ -21,7 +21,7 @@ program FReader if( irank == 0 ) then ! Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, MPI_COMM_SELF, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_SELF, ierr) ! Declare an IO process configuration inside adios call adios2_declare_io(io, adios, "FReader", ierr) diff --git a/examples/hello/bpFWriteCRead/FWriter.f90 b/examples/hello/bpFWriteCRead/FWriter.f90 index d875156ea6..f879ec7905 100644 --- a/examples/hello/bpFWriteCRead/FWriter.f90 +++ b/examples/hello/bpFWriteCRead/FWriter.f90 @@ -40,7 +40,7 @@ program FWriter count_dims(2) = iny ! Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) ! Declare an IO process configuration inside adios call adios2_declare_io(io, adios, "FWriter", ierr) diff --git a/examples/hello/bpReader/helloBPReaderHeatMap3D.F90 b/examples/hello/bpReader/helloBPReaderHeatMap3D.F90 index a87876f736..e44d9c53bf 100644 --- a/examples/hello/bpReader/helloBPReaderHeatMap3D.F90 +++ b/examples/hello/bpReader/helloBPReaderHeatMap3D.F90 @@ -50,9 +50,9 @@ program helloBPReaderHeatMap3D ! Start adios2 Writer #if ADIOS2_USE_MPI - call adios2_init( adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr ) + call adios2_init( adios, MPI_COMM_WORLD, ierr ) #else - call adios2_init( adios, adios2_debug_mode_on, ierr) + call adios2_init( adios, ierr) #endif call adios2_declare_io( ioPut, adios, 'HeatMapWrite', ierr ) diff --git a/examples/hello/bpTimeWriter/helloBPTimeWriter.py b/examples/hello/bpTimeWriter/helloBPTimeWriter.py index 680a5c0942..4ddff5a1aa 100644 --- a/examples/hello/bpTimeWriter/helloBPTimeWriter.py +++ b/examples/hello/bpTimeWriter/helloBPTimeWriter.py @@ -22,7 +22,7 @@ time = np.array([0.0]) # ADIOS -adios = adios2.ADIOS(comm, adios2.DebugON) +adios = adios2.ADIOS(comm) # IO bpIO = adios.DeclareIO("BPN2N") diff --git a/examples/hello/bpWriter/helloBPWriter.F90 b/examples/hello/bpWriter/helloBPWriter.F90 index 1a7610f9f2..d1cea302ae 100644 --- a/examples/hello/bpWriter/helloBPWriter.F90 +++ b/examples/hello/bpWriter/helloBPWriter.F90 @@ -38,11 +38,11 @@ program helloBPWriter start_dims(1) = irank * inx count_dims(1) = inx - ! Create adios handler passing the communicator, debug mode and error flag + ! Create adios handler passing the communicator and error flag #if ADIOS2_USE_MPI - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) #else - call adios2_init(adios, adios2_debug_mode_on, ierr) + call adios2_init(adios, ierr) #endif ! Declare an IO process configuration inside adios diff --git a/examples/hello/bpWriter/helloBPWriter.c b/examples/hello/bpWriter/helloBPWriter.c index a8977df8ce..789f21e034 100644 --- a/examples/hello/bpWriter/helloBPWriter.c +++ b/examples/hello/bpWriter/helloBPWriter.c @@ -60,9 +60,9 @@ int main(int argc, char *argv[]) } #if ADIOS2_USE_MPI - adios2_adios *adios = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adios = adios2_init_mpi(MPI_COMM_WORLD); #else - adios2_adios *adios = adios2_init(adios2_debug_mode_on); + adios2_adios *adios = adios2_init_serial(); #endif check_handler(adios, "adios"); diff --git a/examples/hello/bpWriter/helloBPWriter.py b/examples/hello/bpWriter/helloBPWriter.py index 306d86dc91..9b51ea6889 100644 --- a/examples/hello/bpWriter/helloBPWriter.py +++ b/examples/hello/bpWriter/helloBPWriter.py @@ -19,7 +19,7 @@ Nx = myArray.size # ADIOS MPI Communicator, debug mode -adios = adios2.ADIOS(comm, adios2.DebugON) +adios = adios2.ADIOS(comm) # ADIOS IO bpIO = adios.DeclareIO("BPFile_N2N") diff --git a/examples/hello/bpWriter/helloBPWriter_nompi.py b/examples/hello/bpWriter/helloBPWriter_nompi.py index 96eaf8e6d1..9428808fa0 100644 --- a/examples/hello/bpWriter/helloBPWriter_nompi.py +++ b/examples/hello/bpWriter/helloBPWriter_nompi.py @@ -13,8 +13,8 @@ myArray = numpy.array([0, 1., 2., 3., 4., 5., 6., 7., 8., 9.]) Nx = myArray.size -# debug mode -adios = adios2.ADIOS(adios2.DebugON) +# adios +adios = adios2.ADIOS() # ADIOS IO bpIO = adios.DeclareIO("BPFile_N2N") diff --git a/source/adios2/common/ADIOSConfig.h.in b/source/adios2/common/ADIOSConfig.h.in index 90898288ec..2fef35756b 100644 --- a/source/adios2/common/ADIOSConfig.h.in +++ b/source/adios2/common/ADIOSConfig.h.in @@ -13,6 +13,8 @@ #define ADIOS2_VERSION_PATCH @ADIOS2_VERSION_PATCH@ #cmakedefine ADIOS2_VERSION_TWEAK @ADIOS2_VERSION_TWEAK@ +#define ADIOS2_VERSION (ADIOS2_VERSION_MAJOR* 10000 + ADIOS2_VERSION_MINOR * 100 + ADIOS2_VERSION_PATCH) + /* * ADIOS Build Information: * @@ -39,4 +41,14 @@ # error "ADIOS2 was not built with MPI enabled." #endif +#ifndef ADIOS2_DEPRECATED +# if defined(__GNUC__) || defined (__clang__) +# define ADIOS2_DEPRECATED __attribute__((deprecated)) +# elif defined(_MSC_VER) +# define ADIOS2_DEPRECATED __declspec(deprecated) +# else +# define ADIOS2_DEPRECATED +# endif +#endif + #endif /* ADIOSCONFIG_H_ */ diff --git a/testing/adios2/bindings/C/TestBPAvailableVariablesAttribites.cpp b/testing/adios2/bindings/C/TestBPAvailableVariablesAttribites.cpp index 00dc83605a..357ed70f2b 100644 --- a/testing/adios2/bindings/C/TestBPAvailableVariablesAttribites.cpp +++ b/testing/adios2/bindings/C/TestBPAvailableVariablesAttribites.cpp @@ -34,11 +34,11 @@ TEST_F(BPAvailableVariablesAttributes, AvailableVariablesAttributes) size_t steps = 5; #if ADIOS2_USE_MPI - adios2_adios *adiosH = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_mpi(MPI_COMM_WORLD); MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); #else - adios2_adios *adiosH = adios2_init(adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_serial(); #endif // count dims are allocated in stack diff --git a/testing/adios2/bindings/C/TestBPWriteAggregateReadLocal.cpp b/testing/adios2/bindings/C/TestBPWriteAggregateReadLocal.cpp index 64b85be962..790ea42580 100644 --- a/testing/adios2/bindings/C/TestBPWriteAggregateReadLocal.cpp +++ b/testing/adios2/bindings/C/TestBPWriteAggregateReadLocal.cpp @@ -36,7 +36,7 @@ void LocalAggregate1D(const std::string substreams) std::vector inumbers(NSteps * Nx); std::vector fnumbers(NSteps * Nx); - adios2_adios *adiosH = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_mpi(MPI_COMM_WORLD); // writer { @@ -175,7 +175,7 @@ void LocalAggregate1DBlock0(const std::string substreams) std::vector inumbers(NSteps * Nx); std::vector fnumbers(NSteps * Nx); - adios2_adios *adiosH = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_mpi(MPI_COMM_WORLD); // writer { diff --git a/testing/adios2/bindings/C/TestBPWriteReadMultiblock.cpp b/testing/adios2/bindings/C/TestBPWriteReadMultiblock.cpp index e8b22442ef..339d6b8711 100644 --- a/testing/adios2/bindings/C/TestBPWriteReadMultiblock.cpp +++ b/testing/adios2/bindings/C/TestBPWriteReadMultiblock.cpp @@ -31,11 +31,11 @@ TEST_F(BPWriteReadMultiblockCC, ZeroSizeBlocks) size_t steps = 5; #if ADIOS2_USE_MPI - adios2_adios *adiosH = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_mpi(MPI_COMM_WORLD); MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); #else - adios2_adios *adiosH = adios2_init(adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_serial(); #endif // count dims are allocated in stack diff --git a/testing/adios2/bindings/C/TestBPWriteTypes.cpp b/testing/adios2/bindings/C/TestBPWriteTypes.cpp index 5877d39d9a..f2911360f5 100644 --- a/testing/adios2/bindings/C/TestBPWriteTypes.cpp +++ b/testing/adios2/bindings/C/TestBPWriteTypes.cpp @@ -28,11 +28,11 @@ class ADIOS2_C_API : public ::testing::Test ADIOS2_C_API() { #if ADIOS2_USE_MPI - adiosH = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adiosH = adios2_init_mpi(MPI_COMM_WORLD); MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &size); #else - adiosH = adios2_init(adios2_debug_mode_on); + adiosH = adios2_init_serial(); #endif } diff --git a/testing/adios2/bindings/C/TestNullWriteRead.cpp b/testing/adios2/bindings/C/TestNullWriteRead.cpp index 48f2773909..f5800c8f33 100644 --- a/testing/adios2/bindings/C/TestNullWriteRead.cpp +++ b/testing/adios2/bindings/C/TestNullWriteRead.cpp @@ -44,9 +44,9 @@ TEST_F(NullWriteReadTests_C_API, NullWriteRead1D8) // Write test data using BP #if ADIOS2_USE_MPI - adios2_adios *adios = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adios = adios2_init_mpi(MPI_COMM_WORLD); #else - adios2_adios *adios = adios2_init(adios2_debug_mode_on); + adios2_adios *adios = adios2_init_serial(); #endif { adios2_io *io = adios2_declare_io(adios, "WriteNull"); diff --git a/testing/adios2/bindings/fortran/TestAdios2BindingsFortranIO.F90 b/testing/adios2/bindings/fortran/TestAdios2BindingsFortranIO.F90 index 29fddacf43..17d69d4fda 100644 --- a/testing/adios2/bindings/fortran/TestAdios2BindingsFortranIO.F90 +++ b/testing/adios2/bindings/fortran/TestAdios2BindingsFortranIO.F90 @@ -14,7 +14,7 @@ subroutine testing_adios_init() integer :: ierr - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) end subroutine testing_adios_init diff --git a/testing/adios2/bindings/fortran/TestBPReadGlobalsByName.F90 b/testing/adios2/bindings/fortran/TestBPReadGlobalsByName.F90 index 9c4773b567..7703096f78 100644 --- a/testing/adios2/bindings/fortran/TestBPReadGlobalsByName.F90 +++ b/testing/adios2/bindings/fortran/TestBPReadGlobalsByName.F90 @@ -19,7 +19,7 @@ program TestBPReadGlobalsByName call MPI_Comm_size(MPI_COMM_WORLD, isize, ierr) ! Start adios2 - call adios2_init(adios, MPI_COMM_SELF, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_SELF, ierr) ! writer call adios2_declare_io(ioWrite, adios, "FWriter", ierr) diff --git a/testing/adios2/bindings/fortran/TestBPWriteMemorySelectionRead2D.F90 b/testing/adios2/bindings/fortran/TestBPWriteMemorySelectionRead2D.F90 index 83fa4ebf1f..742e4bd35a 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteMemorySelectionRead2D.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteMemorySelectionRead2D.F90 @@ -54,7 +54,7 @@ program TestBPWriteMemorySelectionRead2D data_r4 = -1.0 data_r8 = -1.0_8 - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) ! Writer call adios2_declare_io(ioPut, adios, 'MemSelWriter', ierr) diff --git a/testing/adios2/bindings/fortran/TestBPWriteMemorySelectionRead3D.F90 b/testing/adios2/bindings/fortran/TestBPWriteMemorySelectionRead3D.F90 index 25ae6bf665..6cf83a1d48 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteMemorySelectionRead3D.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteMemorySelectionRead3D.F90 @@ -56,7 +56,7 @@ program TestBPWriteMemorySelectionRead3D data_r4 = -1.0 data_r8 = -1.0_8 - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) ! Writer call adios2_declare_io(ioPut, adios, 'MemSelWriter', ierr) diff --git a/testing/adios2/bindings/fortran/TestBPWriteReadAttributes.F90 b/testing/adios2/bindings/fortran/TestBPWriteReadAttributes.F90 index 6209c60f0b..7499017818 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteReadAttributes.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteReadAttributes.F90 @@ -35,7 +35,7 @@ program TestBPWriteAttributes call MPI_Init(ierr) ! Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) !!!!!!!!!!!!!!!!!!!!!!!!! WRITER !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Declare an IO process configuration inside adios diff --git a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap2D.F90 b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap2D.F90 index 99ec972914..f7509f460c 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap2D.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap2D.F90 @@ -60,7 +60,7 @@ program TestBPWriteReadHeatMap2D temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) call adios2_define_variable(var_temperatures(1), ioPut, & diff --git a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap3D.F90 b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap3D.F90 index fb9a81f690..54290ac7be 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap3D.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap3D.F90 @@ -61,7 +61,7 @@ program TestBPWriteReadHeatMap3D temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) call adios2_define_variable(var_temperatures(1), ioPut, & diff --git a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap4D.F90 b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap4D.F90 index 988552248e..e03c9b6e74 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap4D.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap4D.F90 @@ -62,7 +62,7 @@ program TestBPWriteReadHeatMap4D temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) call adios2_define_variable(var_temperatures(1), ioPut, & diff --git a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap5D.F90 b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap5D.F90 index e8c5207b77..daed346f93 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap5D.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap5D.F90 @@ -63,7 +63,7 @@ program TestBPWriteReadHeatMap5D temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) call adios2_define_variable(var_temperatures(1), ioPut, & diff --git a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap6D.F90 b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap6D.F90 index 6256cef607..46a5aa6648 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap6D.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteReadHeatMap6D.F90 @@ -64,7 +64,7 @@ program TestBPWriteReadHeatMap6D temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) call adios2_define_variable(var_temperatures(1), ioPut, & diff --git a/testing/adios2/bindings/fortran/TestBPWriteTypes.F90 b/testing/adios2/bindings/fortran/TestBPWriteTypes.F90 index 4187762225..b50dad7d29 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteTypes.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteTypes.F90 @@ -59,9 +59,9 @@ program TestBPWriteTypes ! Create adios handler passing the communicator, debug mode and error flag #if ADIOS2_USE_MPI - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) #else - call adios2_init(adios, adios2_debug_mode_on, ierr) + call adios2_init(adios, ierr) #endif if( adios%valid .eqv. .false. ) stop 'Invalid adios2_init' diff --git a/testing/adios2/bindings/fortran/TestBPWriteTypesByName.F90 b/testing/adios2/bindings/fortran/TestBPWriteTypesByName.F90 index 3cdce0c604..f3e3b4190d 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteTypesByName.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteTypesByName.F90 @@ -30,7 +30,7 @@ program TestBPWriteTypes count_dims(1) = inx ! Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) !!!!!!!!!!!!!!!!!!!!!!!!! WRITER !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Declare an IO process configuration inside adios diff --git a/testing/adios2/bindings/fortran/TestBPWriteTypesLocal.F90 b/testing/adios2/bindings/fortran/TestBPWriteTypesLocal.F90 index 5508137319..aaa599be53 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteTypesLocal.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteTypesLocal.F90 @@ -39,7 +39,7 @@ program TestBPWriteTypes changing_count_dims(1) = inx ! Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) !!!!!!!!!!!!!!!!!!!!!!!!! WRITER !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Declare an IO process configuration inside adios diff --git a/testing/adios2/bindings/fortran/TestBPWriteVariableAttributes.F90 b/testing/adios2/bindings/fortran/TestBPWriteVariableAttributes.F90 index 693026dcb4..a8604295e5 100644 --- a/testing/adios2/bindings/fortran/TestBPWriteVariableAttributes.F90 +++ b/testing/adios2/bindings/fortran/TestBPWriteVariableAttributes.F90 @@ -18,7 +18,7 @@ program TestBPWriteVariableAttributes call MPI_Init(ierr) ! Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) !!!!!!!!!!!!!!!!!!!!!!!!! WRITER !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Declare an IO process configuration inside adios diff --git a/testing/adios2/bindings/fortran/TestNullEngine.F90 b/testing/adios2/bindings/fortran/TestNullEngine.F90 index 93db283d22..1599f88e14 100644 --- a/testing/adios2/bindings/fortran/TestNullEngine.F90 +++ b/testing/adios2/bindings/fortran/TestNullEngine.F90 @@ -30,7 +30,7 @@ program TestNullEngine count_dims(1) = inx ! Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) !!!!!!!!!!!!!!!!!!!!!!!!! WRITER !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Declare an IO process configuration inside adios diff --git a/testing/adios2/bindings/fortran/TestRemove.F90 b/testing/adios2/bindings/fortran/TestRemove.F90 index e5f4161dd9..7059c599dd 100644 --- a/testing/adios2/bindings/fortran/TestRemove.F90 +++ b/testing/adios2/bindings/fortran/TestRemove.F90 @@ -35,9 +35,9 @@ program TestRemove ! Create adios handler passing the communicator, debug mode and error flag #if ADIOS2_USE_MPI - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) #else - call adios2_init(adios, adios2_debug_mode_on, ierr) + call adios2_init(adios, ierr) #endif !!!!!!!!!!!!!!!!!!!!!!!!! WRITER !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/testing/adios2/bindings/fortran/operation/TestBPWriteReadSZ2D.F90 b/testing/adios2/bindings/fortran/operation/TestBPWriteReadSZ2D.F90 index edcff011e8..0ebc6d53f4 100644 --- a/testing/adios2/bindings/fortran/operation/TestBPWriteReadSZ2D.F90 +++ b/testing/adios2/bindings/fortran/operation/TestBPWriteReadSZ2D.F90 @@ -62,7 +62,7 @@ program TestBPWriteReadHeatMapSZ2D temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) call adios2_define_variable(var_temperatures(1), ioPut, & diff --git a/testing/adios2/bindings/fortran/operation/TestBPWriteReadSZ3D.F90 b/testing/adios2/bindings/fortran/operation/TestBPWriteReadSZ3D.F90 index 76e9360537..340cefd442 100644 --- a/testing/adios2/bindings/fortran/operation/TestBPWriteReadSZ3D.F90 +++ b/testing/adios2/bindings/fortran/operation/TestBPWriteReadSZ3D.F90 @@ -63,7 +63,7 @@ program TestBPWriteReadHeatMapSZ3D temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) call adios2_define_variable(var_temperatures(1), ioPut, & diff --git a/testing/adios2/bindings/fortran/operation/TestBPWriteReadZfp2D.F90 b/testing/adios2/bindings/fortran/operation/TestBPWriteReadZfp2D.F90 index 2a56286fd8..bad8e9a00b 100644 --- a/testing/adios2/bindings/fortran/operation/TestBPWriteReadZfp2D.F90 +++ b/testing/adios2/bindings/fortran/operation/TestBPWriteReadZfp2D.F90 @@ -62,7 +62,7 @@ program TestBPWriteReadHeatMapZfp2D temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) call adios2_define_variable(var_temperatures(1), ioPut, & diff --git a/testing/adios2/bindings/fortran/operation/TestBPWriteReadZfp2DRemove.F90 b/testing/adios2/bindings/fortran/operation/TestBPWriteReadZfp2DRemove.F90 index d87afa8e1c..70d962dde3 100644 --- a/testing/adios2/bindings/fortran/operation/TestBPWriteReadZfp2DRemove.F90 +++ b/testing/adios2/bindings/fortran/operation/TestBPWriteReadZfp2DRemove.F90 @@ -41,7 +41,7 @@ program TestBPWriteReadHeatMapZfp2DRemove temperatures_r8 = 1.0_8 ! Start adios2 Writer - call adios2_init(adios, MPI_COMM_WORLD, adios2_debug_mode_on, ierr) + call adios2_init(adios, MPI_COMM_WORLD, ierr) call adios2_define_operator(zfp_operator, adios, 'CompressorZfp', 'zfp', ierr) call adios2_declare_io(ioPut, adios, 'HeatMapWrite', ierr) diff --git a/testing/adios2/bindings/python/TestBPWriteReadTypes_nompi.py b/testing/adios2/bindings/python/TestBPWriteReadTypes_nompi.py index f58cffc457..28ca3730bd 100644 --- a/testing/adios2/bindings/python/TestBPWriteReadTypes_nompi.py +++ b/testing/adios2/bindings/python/TestBPWriteReadTypes_nompi.py @@ -16,7 +16,7 @@ # Test data data = SmallTestData() -adios = adios2.ADIOS(adios2.DebugON) +adios = adios2.ADIOS() bpIO = adios.DeclareIO("NPTypes") diff --git a/testing/adios2/engine/bp/TestBPLargeMetadata.cpp b/testing/adios2/engine/bp/TestBPLargeMetadata.cpp index 683e3efd30..785ccb1781 100644 --- a/testing/adios2/engine/bp/TestBPLargeMetadata.cpp +++ b/testing/adios2/engine/bp/TestBPLargeMetadata.cpp @@ -111,9 +111,9 @@ TEST_F(BPLargeMetadata, ManyLongStrings) const std::size_t NVars = 100; #if ADIOS2_USE_MPI - adios2::ADIOS adios(MPI_COMM_WORLD, true); + adios2::ADIOS adios(MPI_COMM_WORLD); #else - adios2::ADIOS adios(true); + adios2::ADIOS adios; #endif adios2::IO io = adios.DeclareIO("myIO"); diff --git a/testing/adios2/engine/bp/TestBPSelectionsOnColumnMajorData.cpp b/testing/adios2/engine/bp/TestBPSelectionsOnColumnMajorData.cpp index 3e614a8925..fbc799ff41 100644 --- a/testing/adios2/engine/bp/TestBPSelectionsOnColumnMajorData.cpp +++ b/testing/adios2/engine/bp/TestBPSelectionsOnColumnMajorData.cpp @@ -165,7 +165,7 @@ TEST_F(ADIOSSelectionColumnMajorTest, 2D) // Write test data as if we were in Fortran (Column-major language) { - adios2::ADIOS adiosF("", "Fortran", true); + adios2::ADIOS adiosF("", "Fortran"); adios2::IO ioWrite = adiosF.DeclareIO("TestIOWrite"); if (!engineName.empty()) { @@ -212,7 +212,7 @@ TEST_F(ADIOSSelectionColumnMajorTest, 2D) // Read data pretending to be a Column-major language { - adios2::ADIOS adiosF("", "Fortran", true); + adios2::ADIOS adiosF("", "Fortran"); adios2::IO ioRead = adiosF.DeclareIO("TestIOReadF"); ioRead.SetEngine("File"); adios2::Engine engine = ioRead.Open(filename, adios2::Mode::Read); @@ -602,7 +602,7 @@ TEST_F(ADIOSSelectionColumnMajorTest, 3D) // Write test data using BP { - adios2::ADIOS adiosF("", "Fortran", true); + adios2::ADIOS adiosF("", "Fortran"); adios2::IO ioWrite = adiosF.DeclareIO("TestIOWrite"); if (!engineName.empty()) { @@ -651,7 +651,7 @@ TEST_F(ADIOSSelectionColumnMajorTest, 3D) // Read data pretending to be a Column-major language { - adios2::ADIOS adiosF("", "Fortran", true); + adios2::ADIOS adiosF("", "Fortran"); adios2::IO ioRead = adiosF.DeclareIO("TestIORead"); ioRead.SetEngine("File"); adios2::Engine engine = ioRead.Open(filename, adios2::Mode::Read); diff --git a/testing/adios2/engine/bp/TestBPSelectionsOnRowMajorData.cpp b/testing/adios2/engine/bp/TestBPSelectionsOnRowMajorData.cpp index 7c64a5018e..365c175359 100644 --- a/testing/adios2/engine/bp/TestBPSelectionsOnRowMajorData.cpp +++ b/testing/adios2/engine/bp/TestBPSelectionsOnRowMajorData.cpp @@ -339,7 +339,7 @@ TEST_F(ADIOSSelectionRowMajorTest, 2D) // Read data pretending to be a Column-major language { - adios2::ADIOS adiosF("", "Fortran", true); + adios2::ADIOS adiosF("", "Fortran"); adios2::IO ioRead = adiosF.DeclareIO("TestIOReadF"); ioRead.SetEngine("File"); adios2::Engine engine = ioRead.Open(filename, adios2::Mode::Read); @@ -836,7 +836,7 @@ TEST_F(ADIOSSelectionRowMajorTest, 3D) // Read data pretending to be a Column-major language { - adios2::ADIOS adiosF("", "Fortran", true); + adios2::ADIOS adiosF("", "Fortran"); adios2::IO ioRead = adiosF.DeclareIO("TestIOReadF"); ioRead.SetEngine("File"); adios2::Engine engine = ioRead.Open(filename, adios2::Mode::Read); diff --git a/testing/adios2/engine/bp/TestBPWriteMemorySelectionRead.cpp b/testing/adios2/engine/bp/TestBPWriteMemorySelectionRead.cpp index 0b1c0a58ad..ef53cefe53 100644 --- a/testing/adios2/engine/bp/TestBPWriteMemorySelectionRead.cpp +++ b/testing/adios2/engine/bp/TestBPWriteMemorySelectionRead.cpp @@ -197,7 +197,7 @@ void BPSteps1D(const size_t ghostCells) #if ADIOS2_USE_MPI adios2::ADIOS adios(MPI_COMM_WORLD); #else - adios2::ADIOS adios(true); + adios2::ADIOS adios; #endif { adios2::IO io = adios.DeclareIO("WriteIO"); diff --git a/testing/adios2/engine/bp/TestBPWriteReadBlockInfo.cpp b/testing/adios2/engine/bp/TestBPWriteReadBlockInfo.cpp index 48c20e5017..387086fc73 100644 --- a/testing/adios2/engine/bp/TestBPWriteReadBlockInfo.cpp +++ b/testing/adios2/engine/bp/TestBPWriteReadBlockInfo.cpp @@ -839,10 +839,9 @@ TEST_F(BPWriteReadBlockInfo, BPWriteReadBlockInfo1D8_C) { #if ADIOS2_USE_MPI - adios2_adios *adiosH = - adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_mpi(MPI_COMM_WORLD); #else - adios2_adios *adiosH = adios2_init(adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_serial(); #endif adios2_io *ioR = adios2_declare_io(adiosH, "ReadIO"); if (!engineName.empty()) diff --git a/testing/adios2/engine/staging-common/TestCommonReadF.F90 b/testing/adios2/engine/staging-common/TestCommonReadF.F90 index 72961d5b47..b8f2637921 100644 --- a/testing/adios2/engine/staging-common/TestCommonReadF.F90 +++ b/testing/adios2/engine/staging-common/TestCommonReadF.F90 @@ -79,13 +79,13 @@ program TestSstRead call MPI_Comm_size(testComm, isize, ierr) !Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, testComm, adios2_debug_mode_on, ierr) + call adios2_init(adios, testComm, ierr) #else irank = 0; isize = 1; !Create adios handler passing the debug mode and error flag - call adios2_init(adios, adios2_debug_mode_on, ierr) + call adios2_init(adios, ierr) #endif !!!!!!!!!!!!!!!!!!!!!!!!! READER !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Declare io reader diff --git a/testing/adios2/engine/staging-common/TestCommonWriteF.F90 b/testing/adios2/engine/staging-common/TestCommonWriteF.F90 index 6e3fcaaab0..1ff2821938 100644 --- a/testing/adios2/engine/staging-common/TestCommonWriteF.F90 +++ b/testing/adios2/engine/staging-common/TestCommonWriteF.F90 @@ -99,9 +99,9 @@ program TestSstWrite #if ADIOS2_USE_MPI !Create adios handler passing the communicator, debug mode and error flag - call adios2_init(adios, testComm, adios2_debug_mode_on, ierr) + call adios2_init(adios, testComm, ierr) #else - call adios2_init(adios, adios2_debug_mode_on, ierr) + call adios2_init(adios, ierr) #endif !!!!!!!!!!!!!!!!!!!!!!!!!WRITER!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/testing/adios2/interface/TestADIOSDefineAttribute.cpp b/testing/adios2/interface/TestADIOSDefineAttribute.cpp index cab73fdcb2..9b90e2c67e 100644 --- a/testing/adios2/interface/TestADIOSDefineAttribute.cpp +++ b/testing/adios2/interface/TestADIOSDefineAttribute.cpp @@ -15,9 +15,9 @@ class ADIOSDefineAttributeTest : public ::testing::Test public: #if ADIOS2_USE_MPI ADIOSDefineAttributeTest() - : adios(MPI_COMM_WORLD, true), io(adios.DeclareIO("TestIO")) + : adios(MPI_COMM_WORLD), io(adios.DeclareIO("TestIO")) #else - ADIOSDefineAttributeTest() : adios(true), io(adios.DeclareIO("TestIO")) + ADIOSDefineAttributeTest() : adios(), io(adios.DeclareIO("TestIO")) #endif { } diff --git a/testing/adios2/interface/TestADIOSDefineVariable.cpp b/testing/adios2/interface/TestADIOSDefineVariable.cpp index f724151e21..24f00fa54e 100644 --- a/testing/adios2/interface/TestADIOSDefineVariable.cpp +++ b/testing/adios2/interface/TestADIOSDefineVariable.cpp @@ -13,9 +13,9 @@ class ADIOSDefineVariableTest : public ::testing::Test public: #if ADIOS2_USE_MPI ADIOSDefineVariableTest() - : adios(MPI_COMM_WORLD, true), io(adios.DeclareIO("TestIO")) + : adios(MPI_COMM_WORLD), io(adios.DeclareIO("TestIO")) #else - ADIOSDefineVariableTest() : adios(true), io(adios.DeclareIO("TestIO")) + ADIOSDefineVariableTest() : adios(), io(adios.DeclareIO("TestIO")) #endif { } diff --git a/testing/adios2/interface/TestADIOSInterfaceWrite.cpp b/testing/adios2/interface/TestADIOSInterfaceWrite.cpp index 20efe62899..3d23262a88 100644 --- a/testing/adios2/interface/TestADIOSInterfaceWrite.cpp +++ b/testing/adios2/interface/TestADIOSInterfaceWrite.cpp @@ -12,11 +12,11 @@ class ADIOSInterfaceWriteTest : public ::testing::Test public: #if ADIOS2_USE_MPI ADIOSInterfaceWriteTest() - : adios(MPI_COMM_SELF, true), io(adios.DeclareIO("TestIO")) + : adios(MPI_COMM_SELF), io(adios.DeclareIO("TestIO")) { } #else - ADIOSInterfaceWriteTest() : adios(true), io(adios.DeclareIO("TestIO")) {} + ADIOSInterfaceWriteTest() : adios(), io(adios.DeclareIO("TestIO")) {} #endif protected: diff --git a/testing/adios2/performance/manyvars/PerfManyVars.c b/testing/adios2/performance/manyvars/PerfManyVars.c index cc2635624e..ff33676473 100644 --- a/testing/adios2/performance/manyvars/PerfManyVars.c +++ b/testing/adios2/performance/manyvars/PerfManyVars.c @@ -210,7 +210,7 @@ int main(int argc, char **argv) } alloc_vars(); - adios2_adios *adiosH = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_mpi(MPI_COMM_WORLD); ioW = adios2_declare_io(adiosH, "multiblockwrite"); // group for writing ioR = adios2_declare_io(adiosH, "multiblockread"); // group for reading set_gdim(); diff --git a/testing/adios2/performance/manyvars/TestManyVars.cpp b/testing/adios2/performance/manyvars/TestManyVars.cpp index 93e0d4bdf2..9e6cc7874b 100644 --- a/testing/adios2/performance/manyvars/TestManyVars.cpp +++ b/testing/adios2/performance/manyvars/TestManyVars.cpp @@ -252,10 +252,9 @@ class TestManyVars : public ::testing::TestWithParam alloc_vars(); #if ADIOS2_USE_MPI - adios2_adios *adiosH = - adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_mpi(MPI_COMM_WORLD); #else - adios2_adios *adiosH = adios2_init(adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_serial(); #endif ioW = adios2_declare_io(adiosH, "multiblockwrite"); // group for writing diff --git a/testing/install/C/main_mpi.c b/testing/install/C/main_mpi.c index add168491e..9341094fe9 100644 --- a/testing/install/C/main_mpi.c +++ b/testing/install/C/main_mpi.c @@ -17,7 +17,7 @@ int main(int argc, char **argv) { MPI_Init(&argc, &argv); - adios2_adios *adios = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adios = adios2_init_mpi(MPI_COMM_WORLD); if (!adios) { fprintf(stderr, "adios2_init() failed\n"); diff --git a/testing/install/C/main_nompi.c b/testing/install/C/main_nompi.c index 82ebd70f96..57899d0624 100644 --- a/testing/install/C/main_nompi.c +++ b/testing/install/C/main_nompi.c @@ -13,10 +13,10 @@ int main(void) { - adios2_adios *adios = adios2_init(adios2_debug_mode_on); + adios2_adios *adios = adios2_init_serial(); if (!adios) { - fprintf(stderr, "adios2_init() failed\n"); + fprintf(stderr, "adios2_init_serial() failed\n"); return 1; } adios2_finalize(adios); diff --git a/testing/utils/cwriter/TestUtilsCWriter.c b/testing/utils/cwriter/TestUtilsCWriter.c index f6aeeb8259..fc1779f2d1 100644 --- a/testing/utils/cwriter/TestUtilsCWriter.c +++ b/testing/utils/cwriter/TestUtilsCWriter.c @@ -27,9 +27,9 @@ int main(int argc, char *argv[]) MPI_Init(&argc, &argv); MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &nproc); - adios2_adios *adiosH = adios2_init(MPI_COMM_WORLD, adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_mpi(MPI_COMM_WORLD); #else - adios2_adios *adiosH = adios2_init(adios2_debug_mode_on); + adios2_adios *adiosH = adios2_init_serial(); #endif char engineName[32] = "BPFile";