ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-config-support

Browse Source 
# 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
parent 342ca7ff1d a6cde11896
commit 510987dc80
412 changed files with 5927 additions and 3856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/commands/test_groups.cpp
View File

@ -316,7 +316,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";

2
unittest/commands/test_kim_commands.cpp
View File

@ -684,7 +684,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";

3
unittest/commands/test_lattice_region.cpp
View File

@ -20,7 +20,6 @@
#include "lammps.h"
#include "lattice.h"
#include "region.h"
#include "utils.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
@ -631,7 +630,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";

6
unittest/commands/test_reset_ids.cpp
View File

@ -637,10 +637,10 @@ TEST_F(ResetIDsTest, DeathTests)
TEST_FAILURE(".*ERROR: Illegal reset_mol_ids command.*",
command("reset_mol_ids all compress"););
TEST_FAILURE(".*ERROR: Illegal reset_mol_ids command.*",
TEST_FAILURE(".*ERROR: Expected boolean parameter instead of 'xxx'.*",
command("reset_mol_ids all compress xxx"););
TEST_FAILURE(".*ERROR: Illegal reset_mol_ids command.*", command("reset_mol_ids all single"););
TEST_FAILURE(".*ERROR: Illegal reset_mol_ids command.*",
TEST_FAILURE(".*ERROR: Expected boolean parameter instead of 'xxx'.*",
command("reset_mol_ids all single xxx"););
}
@ -686,7 +686,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";

30
unittest/commands/test_simple_commands.cpp
View File

@ -20,7 +20,6 @@
#include "input.h"
#include "output.h"
#include "update.h"
#include "utils.h"
#include "variable.h"
#include "../testing/core.h"
@ -160,7 +159,8 @@ TEST_F(SimpleCommandsTest, Partition)
BEGIN_HIDE_OUTPUT();
command("echo none");
END_HIDE_OUTPUT();
TEST_FAILURE(".*ERROR: Illegal partition command .*", command("partition xxx 1 echo none"););
TEST_FAILURE(".*ERROR: Expected boolean parameter instead of 'xxx'.*",
command("partition xxx 1 echo none"););
TEST_FAILURE(".*ERROR: Numeric index 2 is out of bounds.*",
command("partition yes 2 echo none"););
@ -216,7 +216,7 @@ TEST_F(SimpleCommandsTest, Quit)
TEST_FAILURE(".*ERROR: Expected integer .*", command("quit xxx"););
// the following tests must be skipped with OpenMPI due to using threads
if (Info::get_mpi_vendor() == "Open MPI") GTEST_SKIP();
if (platform::mpi_vendor() == "Open MPI") GTEST_SKIP();
ASSERT_EXIT(command("quit"), ExitedWithCode(0), "");
ASSERT_EXIT(command("quit 9"), ExitedWithCode(9), "");
}
@ -248,6 +248,8 @@ TEST_F(SimpleCommandsTest, Suffix)
ASSERT_EQ(lmp->suffix2, nullptr);
TEST_FAILURE(".*ERROR: May only enable suffixes after defining one.*", command("suffix on"););
TEST_FAILURE(".*ERROR: May only enable suffixes after defining one.*", command("suffix yes"););
TEST_FAILURE(".*ERROR: May only enable suffixes after defining one.*", command("suffix true"););
BEGIN_HIDE_OUTPUT();
command("suffix one");
@ -271,6 +273,26 @@ TEST_F(SimpleCommandsTest, Suffix)
END_HIDE_OUTPUT();
ASSERT_EQ(lmp->suffix_enable, 0);
BEGIN_HIDE_OUTPUT();
command("suffix yes");
END_HIDE_OUTPUT();
ASSERT_EQ(lmp->suffix_enable, 1);
BEGIN_HIDE_OUTPUT();
command("suffix no");
END_HIDE_OUTPUT();
ASSERT_EQ(lmp->suffix_enable, 0);
BEGIN_HIDE_OUTPUT();
command("suffix true");
END_HIDE_OUTPUT();
ASSERT_EQ(lmp->suffix_enable, 1);
BEGIN_HIDE_OUTPUT();
command("suffix false");
END_HIDE_OUTPUT();
ASSERT_EQ(lmp->suffix_enable, 0);
BEGIN_HIDE_OUTPUT();
command("suffix on");
END_HIDE_OUTPUT();
@ -505,7 +527,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";

2
unittest/commands/test_variables.cpp
View File

@ -517,7 +517,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";