Merge branch 'master' into multi-config-support

# Conflicts:
#	cmake/Modules/Packages/MSCG.cmake
#	examples/plugins/CMakeLists.txt
This commit is contained in:
Axel Kohlmeyer
2021-10-11 17:03:41 -04:00
412 changed files with 5927 additions and 3856 deletions

View File

@ -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";

View File

@ -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);