jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,514 Commits 9 Branches 198 Tags 1.1 GiB
Commit Graph

15514 Commits

Author SHA1 Message Date
Richard Berger 0b951840f2
Merge pull request #1103 from rbberger/cmake-fix-user-omp 
cmake: add missing fix_omp.h and fix_omp.cpp to compilation
 2018-09-05 21:27:24 -04:00
Stan Moore 95c3d2fc8e
Merge pull request #1051 from stanmoore1/data_dup 
Add data duplication option to the KOKKOS package
 2018-09-05 17:09:09 -06:00
Richard Berger ad498811b1 cmake: add missing fix_omp.h and fix_omp.cpp to compilation 2018-09-05 16:04:35 -04:00
Richard Berger 510e09f4ef patch 5Sep18 2018-09-05 13:39:18 -04:00
Richard Berger a28990ed8d
Merge pull request #989 from rhalver/ScaFaCoS 
[Feature Contribution] Scafacos
 2018-09-05 11:24:13 -04:00
Steve Plimpton d3d16882ca remove note for Rene 2018-09-05 08:12:19 -06:00
Richard Berger 09ef2bc829
Merge pull request #1093 from rbberger/cmake-fixes 
Collection of CMake fixes
 2018-09-04 21:51:47 -04:00
Richard Berger f8b8ebed5b
Merge pull request #1098 from junghans/cmake_testing 
cmake: only add tests if exe is build
 2018-09-04 21:50:23 -04:00
Richard Berger ff2e13e063 Merge branch 'master' into ScaFaCoS 2018-09-04 21:35:46 -04:00
Richard Berger 8608b4f93c Remove extra libm in LAMMPS_LINK_LIBS 2018-09-04 21:31:08 -04:00
Christoph Junghans db7c2549d0
cmake: inject with-pic into Scafacos 2018-09-04 17:05:59 -06:00
Christoph Junghans 037420b611 cmake: only add tests if exe is build 2018-09-04 14:59:30 -06:00
Richard Berger 5edff5d970
Merge pull request #1095 from rbberger/cmake-add-core-tests 
Add core tests to CMake
 2018-09-04 16:28:26 -04:00
Richard Berger af4b2b9354 Add LAMMPS_TESTING_SOURCE_DIR and LAMMPS_TESTING_GIT_TAG options 2018-09-04 15:37:32 -04:00
Richard Berger 842136afc8 Add core tests to CMake 2018-09-04 12:12:49 -04:00
Axel Kohlmeyer 990f733d22
Merge pull request #1091 from akohlmey/less-compiler-warnings 
Collected diverse small changes
 2018-09-04 10:30:04 -04:00
Richard Berger f18f12d1a6 Fix NETCDF include and libs in CMake 2018-09-04 09:15:00 -04:00
Axel Kohlmeyer a6dfab6f27 recover some const'ness in Domain class, that was lost when merging MESSAGE package. fixes lib/atc compilation issue 2018-09-04 09:13:22 -04:00
Axel Kohlmeyer 1d3116d7c2 Merge branch 'master' into less-compiler-warnings 2018-09-04 08:59:12 -04:00
Richard Berger c9cf3fba8f
Merge pull request #1013 from lammps/cslib 
new MESSAGE package for client/server/coupling
 2018-09-04 08:29:15 -04:00
Axel Kohlmeyer 9e03bf7db9 make USER-DIFFRACTION input example fully consistent with output and remove additional input file 2018-09-01 19:12:46 -04:00
Richard Berger 754036462f
Merge pull request #1088 from junghans/pkgconfig_version 
liblammps.pc: add lammps version
 2018-09-01 11:40:56 -04:00
Steve Plimpton 5f0423b97d change -mpi to -mpicolor 2018-08-31 17:04:27 -06:00
Steve Plimpton a299a7fa28 Merge branch 'cslib' of github.com:lammps/lammps into cslib 2018-08-31 16:37:19 -06:00
Steve Plimpton 78301e5e93 Merge branch 'master' into cslib 2018-08-31 16:30:28 -06:00
Steve Plimpton f66ce801ad final testing 2018-08-31 16:21:45 -06:00
Steve Plimpton bc62002b1c units and doc changes 2018-08-31 16:05:24 -06:00
Christoph Junghans 41f0951d0c liblammps.pc: add lammps version 2018-08-31 10:09:03 -06:00
Steven J. Plimpton 8f5512eafe patch 31Aug18 2018-08-31 09:49:35 -06:00
Steve Plimpton 4f30842ac4
Merge pull request #1086 from junghans/find_lammps_cmake 
cmake: add FindLAMMPS.cmake.in
 2018-08-31 09:32:28 -06:00
Richard Berger b0f5400d52 Add utility function to determine LAMMPS version in CMake 2018-08-29 16:12:16 -04:00
Christoph Junghans db180209b3 FindLAMMPS.cmake: add LAMMPS_API_DEFINES 2018-08-29 13:20:25 -06:00
Christoph Junghans 47b8a116a6 liblammps.pc: fixed a typo 2018-08-29 13:20:04 -06:00
Axel Kohlmeyer 054abe280e squash some more compiler warnings 2018-08-29 14:55:36 -04:00
Christoph Junghans 499ffa198d cmake: change too generic LIB_SUFFIX to LAMMPS_LIB_SUFFIX 2018-08-29 11:31:28 -06:00
Christoph Junghans c5861307f6 cmake: add FindLAMMPS.cmake.in 2018-08-29 10:58:09 -06:00
Steve Plimpton 447a6c3373
Merge pull request #1085 from akohlmey/silence-user-cgsdk-warnings 
Silence  USER-CGSD warnings
 2018-08-29 07:50:11 -06:00
Steve Plimpton 40e7ea83a3
Merge pull request #1084 from rbberger/cmake-and-warning-suppression-bugs 
Fixes various compilation issues
 2018-08-29 07:49:52 -06:00
Steve Plimpton ed61ed5b56
Merge pull request #1082 from jrgissing/bond/react-competing-reactions 
Bond/react: treatment of simultaneous competing reactions
 2018-08-29 07:49:25 -06:00
Steve Plimpton a8f1fe8f96
Merge pull request #1078 from junghans/manpage 
added manpage from debian package
 2018-08-29 07:48:48 -06:00
Steve Plimpton c61f9248f4
Merge pull request #987 from sergeylishchuk/master 
Added Axilrod-Teller manybody potential
 2018-08-29 07:48:22 -06:00
Richard Berger 0860b9e674 Build cslib static or as shared 2018-08-29 07:52:16 -04:00
Richard Berger a7e9076bc0 Rename to libcsmpi/libcsnompi like in Makefile 2018-08-29 07:30:53 -04:00
Richard Berger 4c32a551bd Rename to libcs.a 2018-08-29 07:24:38 -04:00
Richard Berger 6ea33e3e89 Fix typo and use ZMQ stubs in CMake when necessary 2018-08-29 06:51:20 -04:00
Steven J. Plimpton 944574232e Merge branch 'cslib' of github.com:lammps/lammps into cslib 2018-08-28 17:09:24 -06:00
Steven J. Plimpton 83d453e78b updates to MD protocol and examples 2018-08-28 17:08:52 -06:00
Richard Berger 30d45e6773 Ensure MESSAGE files are added to CMake compilation 2018-08-28 15:22:43 -04:00
Axel Kohlmeyer 03654b2b7f rename define to better fit LAMMPS' logic 2018-08-28 15:19:07 -04:00
Axel Kohlmeyer eb850c5326 silence compiler warning about unused static function in shared include file 2018-08-28 15:17:31 -04:00