correct logic and also skip for USER-OMP (f1685afa) · Commits · 郑智淋 / lammps

unittest/force-styles/pair_style.cpp

+60 −57

Original line number	Diff line number	Diff line
		@@ -450,7 +450,7 @@ TEST(PairStyle, plain) {
		if (!verbose) ::testing::internal::GetCapturedStdout();

		// 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;
		tag=lmp->atom->tag;
		@@ -738,6 +738,9 @@ TEST(PairStyle, omp) {
		lmp = init_lammps(argc,argv,test_config,false);
		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;
		tag=lmp->atom->tag;
		stats.reset();
		@@ -800,7 +803,7 @@ TEST(PairStyle, omp) {
		EXPECT_FP_LE_WITH_EPS((pair->eng_vdwl+pair->eng_coul),energy, epsilon);
		if (print_stats)
		std::cerr << "run_energy stats, newton off:" << stats << std::endl;

		}
		if (!verbose) ::testing::internal::CaptureStdout();
		cleanup_lammps(lmp,test_config);
		if (!verbose) ::testing::internal::GetCapturedStdout();