Merge branch 'master' into kim_commands

This commit is contained in:
Axel Kohlmeyer
2021-02-23 09:34:32 -05:00
405 changed files with 14265 additions and 8326 deletions

View File

@ -74,7 +74,7 @@ TEST(LAMMPSConfig, package_name)
EXPECT_EQ(lammps_config_package_name(numpkgs + 10, buf, 128), 0);
EXPECT_THAT(buf, StrEq(""));
} else {
EXPECT_EQ(lammps_config_package_name(0, buf, 128), 1);
EXPECT_EQ(lammps_config_package_name(0, buf, 128), 0);
EXPECT_THAT(buf, StrEq(""));
}
};
@ -200,7 +200,10 @@ TEST(LAMMPSConfig, exceptions)
TEST(LAMMPSConfig, mpi_support)
{
EXPECT_EQ(lammps_config_has_mpi_support(), LAMMPS_HAS_MPI);
if (LAMMPS_HAS_MPI)
EXPECT_GT(lammps_config_has_mpi_support(), 0);
else
EXPECT_EQ(lammps_config_has_mpi_support(), 0);
};
TEST(LAMMPSConfig, png_support)

View File

@ -37,7 +37,7 @@ class PythonOpen(unittest.TestCase):
lmp=lammps(name=self.machine)
self.assertIsNot(lmp.lmp,None)
self.assertEqual(lmp.opened,1)
self.assertEqual(has_mpi4py,lmp.has_mpi4py)
self.assertEqual(has_mpi and has_mpi4py,lmp.has_mpi4py)
self.assertEqual(has_mpi,lmp.has_mpi_support)
lmp.close()
self.assertIsNone(lmp.lmp,None)