must skip nofdotr test for sw since that requires newton on with /intel
This commit is contained in:
@ -166,8 +166,10 @@ void restart_lammps(LAMMPS *lmp, const TestConfig &cfg, bool nofdotr = false, bo
|
||||
};
|
||||
|
||||
command("clear");
|
||||
if (newton) command("newton on");
|
||||
else command("newton off");
|
||||
if (newton)
|
||||
command("newton on");
|
||||
else
|
||||
command("newton off");
|
||||
command("read_restart " + cfg.basename + ".restart");
|
||||
|
||||
if (!lmp->force->pair) {
|
||||
@ -1086,10 +1088,13 @@ TEST(PairStyle, intel)
|
||||
EXPECT_FP_LE_WITH_EPS((pair->eng_vdwl + pair->eng_coul), energy, epsilon);
|
||||
if (print_stats) std::cerr << "run_energy stats:" << stats << std::endl;
|
||||
|
||||
// pair style sw requires newton on, but that also requires fdotr for /intel
|
||||
std::cerr << "pair style : " << test_config.pair_style << "\n";
|
||||
if (test_config.pair_style != "sw") {
|
||||
|
||||
if (!verbose) ::testing::internal::CaptureStdout();
|
||||
restart_lammps(lmp, test_config, true, false);
|
||||
if (!verbose) ::testing::internal::GetCapturedStdout();
|
||||
|
||||
f = lmp->atom->f;
|
||||
tag = lmp->atom->tag;
|
||||
stats.reset();
|
||||
@ -1116,7 +1121,7 @@ TEST(PairStyle, intel)
|
||||
EXPECT_FP_LE_WITH_EPS(pair->eng_vdwl, test_config.init_vdwl, 5 * epsilon);
|
||||
EXPECT_FP_LE_WITH_EPS(pair->eng_coul, test_config.init_coul, 5 * epsilon);
|
||||
if (print_stats) std::cerr << "nofdotr_energy stats:" << stats << std::endl;
|
||||
|
||||
}
|
||||
if (!verbose) ::testing::internal::CaptureStdout();
|
||||
cleanup_lammps(lmp, test_config);
|
||||
if (!verbose) ::testing::internal::GetCapturedStdout();
|
||||
|
||||
Reference in New Issue
Block a user