Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,18 @@ endif()

# ADIOS2 Backend
if(openPMD_HAVE_ADIOS2)
if(openPMD_HAVE_MPI)
target_link_libraries(openPMD PUBLIC adios2::cxx11_mpi)
if(${ADIOS2_VERSION} VERSION_GREATER_EQUAL 2.11.0)
if(openPMD_HAVE_MPI)
target_link_libraries(openPMD PUBLIC adios2::cxx_mpi)
else()
target_link_libraries(openPMD PUBLIC adios2::cxx)
endif()
else()
target_link_libraries(openPMD PUBLIC adios2::cxx11)
if(openPMD_HAVE_MPI)
target_link_libraries(openPMD PUBLIC adios2::cxx11_mpi)
else()
target_link_libraries(openPMD PUBLIC adios2::cxx11)
endif()
endif()
endif()

Expand Down
9 changes: 5 additions & 4 deletions test/SerialIOTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5853,10 +5853,11 @@ void variableBasedSeries(std::string const &file)

iteration.setAttribute("changing_value", i);

// this tests changing extents and dimensionalities
// across iterations
// this tests changing extents across iterations
// ADIOS2 does not support changing the dimensionality
// (older versions used to somewhat support it, but not really)
auto E_y = iteration.meshes["E"]["y"];
unsigned dimensionality = i % 3 + 1;
unsigned dimensionality = 3;
unsigned len = i + 1;
Extent changingExtent(dimensionality, len);
E_y.resetDataset({openPMD::Datatype::INT, changingExtent});
Expand Down Expand Up @@ -5984,7 +5985,7 @@ void variableBasedSeries(std::string const &file)
}

auto E_y = iteration.meshes["E"]["y"];
unsigned dimensionality = index % 3 + 1;
unsigned dimensionality = 3;
unsigned len = index + 1;
Extent changingExtent(dimensionality, len);
REQUIRE(E_y.getExtent() == changingExtent);
Expand Down
Loading