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

Merge branch 'gpu-bugfix' into gpu-unittest

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-08-27 18:01:27 -04:00
parent 13cf665712 463774319e
commit d0cffd83af
2080 changed files with 27200 additions and 73692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
unittest/force-styles/test_pair_style.cpp
View File

@ -652,6 +652,14 @@ TEST(PairStyle, omp)
EXPECT_THAT(output, StartsWith("LAMMPS ("));
EXPECT_THAT(output, HasSubstr("Loop time"));
if (utils::strmatch(test_config.pair_style, "^dpd")) {
std::cerr << "Skipping pair style " << lmp->force->pair_style << "\n";
if (!verbose) ::testing::internal::CaptureStdout();
cleanup_lammps(lmp, test_config);
if (!verbose) ::testing::internal::GetCapturedStdout();
GTEST_SKIP();
}
// abort if running in parallel and not all atoms are local
const int nlocal = lmp->atom->nlocal;
ASSERT_EQ(lmp->atom->natoms, nlocal);
@ -936,11 +944,11 @@ TEST(PairStyle, intel)
GTEST_SKIP();
}
if (test_config.pair_style == "rebo") {
if ((test_config.pair_style == "rebo") || utils::strmatch(test_config.pair_style, "^dpd")) {
std::cerr << "Skipping pair style " << lmp->force->pair_style << "\n";
if (!verbose) ::testing::internal::CaptureStdout();
cleanup_lammps(lmp, test_config);
if (!verbose) ::testing::internal::GetCapturedStdout();
std::cerr << "Skipping pair style rebo/intel\n";
GTEST_SKIP();
}
@ -1218,6 +1226,7 @@ TEST(PairStyle, single)
// Pair styles colloid and yukawa/colloid are also not compatible with this single tester
if ((test_config.pair_style.substr(0, 7) == "colloid") ||
(test_config.pair_style.substr(0, 14) == "yukawa/colloid") ||
(test_config.pair_style.substr(0, 3) == "dpd") ||
(test_config.pair_style.substr(0, 3) == "eam") ||
((test_config.pair_style.substr(0, 6) == "hybrid") &&
(test_config.pair_style.find("eam") != std::string::npos))) {