Merge branch 'master' into multi-config-support
# Conflicts: # cmake/Modules/Packages/MSCG.cmake # examples/plugins/CMakeLists.txt
This commit is contained in:
@ -128,7 +128,7 @@ int main(int argc, char **argv)
|
||||
MPI_Init(&argc, &argv);
|
||||
::testing::InitGoogleMock(&argc, argv);
|
||||
|
||||
if (Info::get_mpi_vendor() == "Open MPI" && !LAMMPS_NS::Info::has_exceptions())
|
||||
if (platform::mpi_vendor() == "Open MPI" && !LAMMPS_NS::Info::has_exceptions())
|
||||
std::cout << "Warning: using OpenMPI without exceptions. "
|
||||
"Death tests will be skipped\n";
|
||||
|
||||
|
||||
@ -325,7 +325,7 @@ TEST_F(LAMMPS_kokkos, InitMembers)
|
||||
TEST(LAMMPS_init, OpenMP)
|
||||
{
|
||||
if (!LAMMPS::is_installed_pkg("OPENMP")) GTEST_SKIP();
|
||||
if (Info::get_openmp_info() == "OpenMP not enabled") GTEST_SKIP();
|
||||
if (platform::openmp_standard() == "OpenMP not enabled") GTEST_SKIP();
|
||||
|
||||
FILE *fp = fopen("in.lammps_empty", "w");
|
||||
fputs("\n", fp);
|
||||
|
||||
Reference in New Issue
Block a user