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

correct logic and also skip for USER-OMP

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-05-26 18:42:47 -04:00
parent c91cad5155
commit f1685afaa7
1 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unittest/force-styles/pair_style.cpp
View File

@ -450,7 +450,7 @@ TEST(PairStyle, plain) {
if (!verbose) ::testing::internal::GetCapturedStdout(); if (!verbose) ::testing::internal::GetCapturedStdout();
// skip over these tests if newton pair is forced to be on // skip over these tests if newton pair is forced to be on
if (lmp->force->newton_pair != 0) { if (lmp->force->newton_pair == 0) {
f=lmp->atom->f; f=lmp->atom->f;
tag=lmp->atom->tag; tag=lmp->atom->tag;
@ -738,6 +738,9 @@ TEST(PairStyle, omp) {
lmp = init_lammps(argc,argv,test_config,false); lmp = init_lammps(argc,argv,test_config,false);
if (!verbose) ::testing::internal::GetCapturedStdout(); if (!verbose) ::testing::internal::GetCapturedStdout();
// skip over these tests if newton pair is forced to be on
if (lmp->force->newton_pair == 0) {
f=lmp->atom->f; f=lmp->atom->f;
tag=lmp->atom->tag; tag=lmp->atom->tag;
stats.reset(); stats.reset();
@ -800,7 +803,7 @@ TEST(PairStyle, omp) {
EXPECT_FP_LE_WITH_EPS((pair->eng_vdwl+pair->eng_coul),energy, epsilon); EXPECT_FP_LE_WITH_EPS((pair->eng_vdwl+pair->eng_coul),energy, epsilon);
if (print_stats) if (print_stats)
std::cerr << "run_energy stats, newton off:" << stats << std::endl; std::cerr << "run_energy stats, newton off:" << stats << std::endl;
}
if (!verbose) ::testing::internal::CaptureStdout(); if (!verbose) ::testing::internal::CaptureStdout();
cleanup_lammps(lmp,test_config); cleanup_lammps(lmp,test_config);
if (!verbose) ::testing::internal::GetCapturedStdout(); if (!verbose) ::testing::internal::GetCapturedStdout();