diff --git a/src/Package.sh b/src/Package.sh index b42494503d..fb3694bb4e 100644 --- a/src/Package.sh +++ b/src/Package.sh @@ -81,7 +81,7 @@ elif (test $2 = "overwrite") then # regenenate Makefile.package from Makefile.package.empty # if installed: -# re-install so Install.sh will edit Makefile.pacakge +# re-install so Install.sh will edit Makefile.package elif (test $2 = "regenerate") then if (test $installed = 1) then diff --git a/src/USER-CUDA/Install.sh b/src/USER-CUDA/Install.sh index 68ab36226a..2994d3cdca 100755 --- a/src/USER-CUDA/Install.sh +++ b/src/USER-CUDA/Install.sh @@ -1,5 +1,5 @@ # Install/unInstall package files in LAMMPS -# edit Makefile.package to include/exclude CUDA library +# edit 2 Makefile.package files to include/exclude CUDA info # do not install child files if parent does not exist if (test $1 = 1) then diff --git a/src/lammps.cpp b/src/lammps.cpp index 85dc1ce67f..7d5a726ac3 100644 --- a/src/lammps.cpp +++ b/src/lammps.cpp @@ -325,6 +325,19 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator) if (mpisize != sizeof(bigint)) error->all("MPI_LMP_BIGINT and bigint in lmptype.h are not compatible"); +#ifdef LAMMPS_SMALLBIG + if (sizeof(smallint) != 4 || sizeof(tagint) != 4 || sizeof(bigint) != 8) + error->all("Small, tag, big integers are not sized correctly"); +#endif +#ifdef LAMMPS_BIGBIG + if (sizeof(smallint) != 4 || sizeof(tagint) != 8 || sizeof(bigint) != 8) + error->all("Small, tag, big integers are not sized correctly"); +#endif +#ifdef LAMMPS_SMALLSMALL + if (sizeof(smallint) != 4 || sizeof(tagint) != 4 || sizeof(bigint) != 4) + error->all("Small, tag, big integers are not sized correctly"); +#endif + if (sizeof(tagint) == 8) error->all("64-bit atom IDs are not yet supported"); // create CUDA class if USER-CUDA installed, unless explicitly switched off