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

rename USER-OMP to OPENMP

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-06-29 17:48:22 -04:00
parent c085e55695
commit 1dc25b0e10
586 changed files with 257 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unittest/force-styles/test_improper_style.cpp
View File

@ -527,7 +527,7 @@ TEST(ImproperStyle, plain)
TEST(ImproperStyle, omp)
{
if (!LAMMPS::is_installed_pkg("USER-OMP")) GTEST_SKIP();
if (!LAMMPS::is_installed_pkg("OPENMP")) GTEST_SKIP();
if (test_config.skip_tests.count(test_info_->name())) GTEST_SKIP();
const char *args[] = {"ImproperStyle", "-log", "none", "-echo", "screen", "-nocite",
@ -558,7 +558,7 @@ TEST(ImproperStyle, omp)
const int nlocal = lmp->atom->nlocal;
ASSERT_EQ(lmp->atom->natoms, nlocal);
// relax error a bit for USER-OMP package
// relax error a bit for OPENMP package
double epsilon = 5.0 * test_config.epsilon;
auto f = lmp->atom->f;
@ -622,7 +622,7 @@ TEST(ImproperStyle, omp)
int id = lmp->modify->find_compute("sum");
double energy = lmp->modify->compute[id]->compute_scalar();
EXPECT_FP_LE_WITH_EPS(improper->energy, test_config.run_energy, epsilon);
// TODO: this is currently broken for USER-OMP with improper style hybrid
// TODO: this is currently broken for OPENMP with improper style hybrid
// needs to be fixed in the main code somewhere. Not sure where, though.
if (test_config.improper_style.substr(0, 6) != "hybrid")
EXPECT_FP_LE_WITH_EPS(improper->energy, energy, epsilon);
@ -689,7 +689,7 @@ TEST(ImproperStyle, omp)
id = lmp->modify->find_compute("sum");
energy = lmp->modify->compute[id]->compute_scalar();
EXPECT_FP_LE_WITH_EPS(improper->energy, test_config.run_energy, epsilon);
// TODO: this is currently broken for USER-OMP with improper style hybrid
// TODO: this is currently broken for OPENMP with improper style hybrid
// needs to be fixed in the main code somewhere. Not sure where, though.
if (test_config.improper_style.substr(0, 6) != "hybrid")
EXPECT_FP_LE_WITH_EPS(improper->energy, energy, epsilon);