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

bulk rename of remaining USER- packages

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-06-29 19:49:18 -04:00
parent 2d4bb8f38c
commit 878795e64a
759 changed files with 878 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/cplusplus/test_lammps_class.cpp
View File

@ -133,7 +133,7 @@ TEST_F(LAMMPS_plain, TestStyles)
found = lmp->match_style("atom", "spin");
EXPECT_STREQ(found, "SPIN");
found = lmp->match_style("atom", "wavepacket");
EXPECT_STREQ(found, "USER-AWPMD");
EXPECT_STREQ(found, "AWPMD");
found = lmp->match_style("atom", "dpd");
EXPECT_STREQ(found, "DPD-REACT");
found = lmp->match_style("atom", "edpd");
@ -147,7 +147,7 @@ TEST_F(LAMMPS_plain, TestStyles)
found = lmp->match_style("atom", "smd");
EXPECT_STREQ(found, "MACHDYN");
found = lmp->match_style("atom", "sph");
EXPECT_STREQ(found, "USER-SPH");
EXPECT_STREQ(found, "SPH");
found = lmp->match_style("atom", "i_don't_exist");
EXPECT_STREQ(found, NULL);
}

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

@ -896,7 +896,7 @@ TEST(PairStyle, gpu)
TEST(PairStyle, intel)
{
if (!LAMMPS::is_installed_pkg("USER-INTEL")) GTEST_SKIP();
if (!LAMMPS::is_installed_pkg("INTEL")) GTEST_SKIP();
if (test_config.skip_tests.count(test_info_->name())) GTEST_SKIP();
const char *args[] = {"PairStyle", "-log", "none", "-echo", "screen", "-nocite",
@ -924,7 +924,7 @@ TEST(PairStyle, intel)
GTEST_SKIP();
}
// relax error a bit for USER-INTEL package
// relax error a bit for INTEL package
double epsilon = 7.5 * test_config.epsilon;
// relax test precision when using pppm and single precision FFTs
#if defined(FFT_SINGLE)
@ -1010,7 +1010,7 @@ TEST(PairStyle, intel)
EXPECT_FP_LE_WITH_EPS(pair->eng_vdwl, test_config.run_vdwl, epsilon);
EXPECT_FP_LE_WITH_EPS(pair->eng_coul, test_config.run_coul, epsilon);
// rebo family of pair styles will have a large error in per-atom energy for USER-INTEL
// rebo family of pair styles will have a large error in per-atom energy for INTEL
if (test_config.pair_style.find("rebo") != std::string::npos) epsilon *= 100000.0;
EXPECT_FP_LE_WITH_EPS((pair->eng_vdwl + pair->eng_coul), energy, epsilon);

14
unittest/python/python-capabilities.py
View File

@ -140,16 +140,16 @@ class PythonCapabilities(unittest.TestCase):
self.assertIn('serial',settings['OPENMP']['api'])
self.assertIn('double',settings['OPENMP']['precision'])
if self.cmake_cache['PKG_USER-INTEL']:
if self.cmake_cache['PKG_INTEL']:
if 'LMP_INTEL_OFFLOAD' in self.cmake_cache.keys():
self.assertIn('phi',settings['USER-INTEL']['api'])
self.assertIn('phi',settings['INTEL']['api'])
elif self.cmake_cache['BUILD_OMP']:
self.assertIn('openmp',settings['USER-INTEL']['api'])
self.assertIn('openmp',settings['INTEL']['api'])
else:
self.assertIn('serial',settings['USER-INTEL']['api'])
self.assertIn('double',settings['USER-INTEL']['precision'])
self.assertIn('mixed',settings['USER-INTEL']['precision'])
self.assertIn('single',settings['USER-INTEL']['precision'])
self.assertIn('serial',settings['INTEL']['api'])
self.assertIn('double',settings['INTEL']['precision'])
self.assertIn('mixed',settings['INTEL']['precision'])
self.assertIn('single',settings['INTEL']['precision'])
if self.cmake_cache['PKG_GPU']:
if self.cmake_cache['GPU_API'].lower() == 'opencl':