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

remove hardcoded checks for incompatible styles. use skip_tests keyword instead

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-03-01 21:44:41 -05:00
parent 5629947d89
commit 6fa3e6d23e
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -627,14 +627,6 @@ TEST(PairStyle, omp)
EXPECT_THAT(output, StartsWith("LAMMPS (")); EXPECT_THAT(output, StartsWith("LAMMPS ("));
EXPECT_THAT(output, HasSubstr("Loop time")); 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 // abort if running in parallel and not all atoms are local
const int nlocal = lmp->atom->nlocal; const int nlocal = lmp->atom->nlocal;
ASSERT_EQ(lmp->atom->natoms, nlocal); ASSERT_EQ(lmp->atom->natoms, nlocal);
@ -930,24 +922,6 @@ TEST(PairStyle, intel)
GTEST_SKIP(); GTEST_SKIP();
} }
if ((test_config.pair_style == "rebo")
|| utils::strmatch(test_config.pair_style, "^dpd")
|| utils::strmatch(test_config.pair_style, "^tersoff.* shift ")) {
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();
}
if (lmp->force->kspace && utils::strmatch(lmp->force->kspace_style, "^pppm/disp/intel")) {
if (!verbose) ::testing::internal::CaptureStdout();
cleanup_lammps(lmp, test_config);
if (!verbose) ::testing::internal::GetCapturedStdout();
std::cerr << "Skipping kspace style pppm/disp/intel\n";
GTEST_SKIP();
}
// relax error a bit for USER-INTEL package // relax error a bit for USER-INTEL package
double epsilon = 7.5 * test_config.epsilon; double epsilon = 7.5 * test_config.epsilon;
// relax test precision when using pppm and single precision FFTs // relax test precision when using pppm and single precision FFTs