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

638 Commits

Author SHA1 Message Date
Axel Kohlmeyer f3850da9fe clean up makefiles provide "serial" and "mpi" targets for atc and awpmd 2017-07-28 13:36:06 -04:00
Axel Kohlmeyer e7d9aabca6 Merge branch 'kim-install' into install-and-docs-reviewed 2017-07-28 11:25:08 -04:00
Stan Moore 9695aa6092 Merge branch 'master' into USER-DPD_kokkos_testing 2017-07-27 15:51:56 -06:00
Axel Kohlmeyer c494ec35e2 correct symbolic links to shared Install.py file 2017-07-27 12:48:32 -04:00
Axel Kohlmeyer acf6d54ec1 python3 port, yet untested 2017-07-27 09:25:39 -04:00
Axel Kohlmeyer 0427f6205e fix typo 2017-07-27 09:25:02 -04:00
Axel Kohlmeyer da7a5f55d3 Merge branch 'kim-install' into install-and-docs-reviewed 2017-07-26 19:32:55 -04:00
Axel Kohlmeyer 715c797df0 simplify Install.py for voronoi 2017-07-26 15:14:12 -04:00
Axel Kohlmeyer fd6e11f821 convert copies of Install.py files to symlinks 2017-07-26 14:29:52 -04:00
Axel Kohlmeyer f7a243a4d9 convert explicit copies back into symbolic links 2017-07-26 14:20:03 -04:00
Axel Kohlmeyer f0d286358e must not include system headers within 'extern "C"' blocks. breaks with MPICH 2017-07-26 14:02:02 -04:00
Stan Moore bc446bb8b0 Merge branch 'master' into USER-DPD_kokkos_testing 2017-07-25 12:12:30 -06:00
Trung Nguyen aa60ef6ed8 Cleaned up 3-body kernels, reverted some mistaken changes to vashishta 2017-07-23 00:08:55 -05:00
Trung Nguyen a71f5a0c20 Enabled again neigh no with tpa > 1 for 3-body gpu styles for backward compatibility, could be slower than neigh no tpa 1 in many cases 2017-07-22 22:57:37 -05:00
Trung Nguyen 3d1d0c58c7 Cleaned up 3-body gpu styles, and fixed a bug for tersoff/zbl/gpu. 
There is a unresolved bug for neigh no with tpa > 1 with BaseThree, enforce tpa = 1 for neigh no in BaseThree for now.
 2017-07-21 12:08:04 -05:00
Axel Kohlmeyer 1b704bab18 Merge branch 'colvars-safer-makefiles' of https://github.com/giacomofiorin/lammps into colvars-quickfix 2017-07-20 15:59:23 -04:00
Giacomo Fiorin c98f6140e7 Change order of targets in Makefiles for Colvars 2017-07-20 15:49:31 -04:00
Giacomo Fiorin 5031f5b807 Comment out use by Colvars of Makefile.lammps from other packages 2017-07-20 15:48:10 -04:00
Axel Kohlmeyer 9d0d90c038 README clarification from giacomo 2017-07-20 15:25:27 -04:00
Axel Kohlmeyer 66154e8a8b avoid makefile failure, if LAMMPS has not been configured yet 2017-07-20 15:05:58 -04:00
Ryan S. Elliott 84065dde21 Refactor lib/kim/Install.py; works with phtyon 3 2.7 2017-07-20 12:02:50 -05:00
Giacomo Fiorin ef9fb944c7 Detect number of processors for make 2017-07-20 10:53:08 -04:00
Giacomo Fiorin 187a80be77 Add forgotten decode() in Install.py 2017-07-19 22:21:49 -04:00
Axel Kohlmeyer 355aad9691 restore python3 support. this now can run with python 2.7.13 and 3.5.3. 2017-07-19 17:19:44 -04:00
Giacomo Fiorin ee6cac826e Update Colvars to version 2017-07-15 and support automated builds for it 2017-07-19 14:24:07 -04:00
Ryan S. Elliott f181a0bfab Update lib/kim/Install.py for phthon 2.7 conversion 2017-07-19 12:54:33 -05:00
Axel Kohlmeyer 81f342aafa fix variable name bug and synchronize with other ported Install.py files 2017-07-18 18:06:18 -04:00
Axel Kohlmeyer 7ccb0d37cd port USER-SMD folder. make voronoi consistent with it 2017-07-18 17:37:48 -04:00
Axel Kohlmeyer 03cd4c5255 ported lib/voronoi/Install.py to python 3.x and tested with 2.7 2017-07-18 17:16:10 -04:00
Richard Berger d7355801df Make KIM Install.py Python 3 compatible 2017-07-15 12:03:04 -05:00
Steve Plimpton 296e572e69 better Install.py script for KIM from Ryan Elliott 2017-07-14 16:25:16 -06:00
Trung Nguyen cdac5f496c Built 3-body short neighbor list for the 3-body kernels using per-pair cutoffs for vashishta gpu style 2017-07-11 00:13:56 -05:00
Trung Nguyen 8c9db3ea00 Built 2-body short neighbor list and used for 2-body kernels in tersoff gpu styles 2017-07-10 23:50:21 -05:00
Ryan S. Elliott e30c5fc956 Fixed shebang and renamed to lib/kim/Install.py 2017-07-10 21:05:29 -05:00
Ryan S. Elliott c29e8fba9b Updated lib/kim/README file to go along with new install.py 2017-07-10 17:00:30 -05:00
Ryan S. Elliott 8d592f4b9e Finalized code for lib/kim/install.py 2017-07-10 16:43:23 -05:00
Trung Nguyen ea2b01e83b Refactored 3-body gpu styles to remove code duplication 2017-07-08 20:17:31 -05:00
Trung Nguyen 34fe2273f6 Added short neighbor list implementation for tersoff/zbl/gpu and tersoff/mod/gpu 2017-07-08 14:59:48 -05:00
Trung Nguyen 77c60189b8 Minor cleanups for tersoff/gpu 2017-07-08 14:43:53 -05:00
Trung Nguyen 1c6533e53d Working on short neighbor list for tersoff/gpu 2017-07-08 14:15:26 -05:00
Trung Nguyen 68206079da Supported short neighbor lists for 3-body kernels in sw/gpu and vashishta/gpu 2017-07-07 16:47:24 -05:00
Ryan S. Elliott b0be8b24ea Further work on lib/kim/install.py 2017-07-06 15:50:03 -05:00
Ryan S. Elliott 16fc2d6fe1 Add install.py and update config for kim lib 2017-07-06 15:49:58 -05:00
Stan Moore da0dcbe0bb Updating to master 2017-06-19 10:56:24 -06:00
sjplimp d3c90f3c14 Merge pull request #510 from akohlmey/collected-small-changes 
Collected small changes
 2017-06-15 11:12:14 -06:00
sjplimp 7227bc415d Merge pull request #526 from andeplane/vashishta_gpu 
Implemented pair style vashishta in GPU package
 2017-06-15 08:52:13 -06:00
Anders Hafreager d7646aeeed Fixed opencl error 2017-06-14 12:03:47 +02:00
Anders Hafreager 5f9341813d Removed debug output 2017-06-14 10:57:54 +02:00
Anders Hafreager 8441307185 Removed non-general CUDA-dir in makefile 2017-06-14 10:28:46 +02:00
Anders Hafreager 720af5c360 Added vashishta to OpenCL makefile 2017-06-14 10:27:52 +02:00
Anders Hafreager eeff0b8633 Added vashishta GPU package for NVidia 2017-06-14 10:24:16 +02:00
Axel Kohlmeyer 0ecdb99885 fix uninitialized data access as reported by @martok in #174 2017-06-08 13:50:17 -04:00
Stan Moore 00ce15d043 Remove tpls dir 2017-06-08 10:43:19 -06:00
Stan Moore 5c1d17d1c0 Updating Kokkos lib to v2.03.05 2017-06-08 10:42:08 -06:00
Stan Moore 2cf83d9fca Updating from master to 19May17 2017-05-25 11:21:10 -06:00
Christian Negre 98713680ec added alternative linking line for intel mkl 2017-05-17 11:36:31 -06:00
Richard Berger f8af7edf92 Merge remote-tracking branch 'upstream/master' into python_refactoring 2017-05-06 16:00:22 -04:00
sjplimp fbddfe2729 Merge pull request #455 from stanmoore1/kokkos_update 
Updating Kokkos library to version 2.03.00
 2017-05-04 11:23:39 -06:00
sjplimp dcc5472cba Merge pull request #452 from akohlmey/small-fixes-and-updates 
Small fixes and updates
 2017-05-04 11:23:23 -06:00
Steve Plimpton addd87c0f7 new Section package and start doc pages and build scripts 2017-05-04 11:22:20 -06:00
Axel Kohlmeyer b8cb80b219 rename files in GPU library from cg_cmm to lj_sdk 2017-04-26 19:46:10 -04:00
Axel Kohlmeyer cd435c0c58 change references from cg_cmm to lj_sdk and from cmm to sdk 2017-04-26 19:44:25 -04:00
Stan Moore cc6104aeaf Merge branch 'master' into kokkos_update 2017-04-25 14:11:36 -06:00
Stan Moore 8910ec6e59 Updating Kokkos lib to 2.03.00 2017-04-25 13:48:51 -06:00
Axel Kohlmeyer 25e8ed63a2 whitespace cleanup in VMD plugin headers 2017-04-18 11:46:19 -04:00
Axel Kohlmeyer dee3536144 update VMD molfile plugin headers and move them to lib/molfile (where they belong) 2017-04-18 11:42:31 -04:00
Axel Kohlmeyer 3cbf4f3b58 correct logic bug in else branch of the conditional 2017-04-14 11:57:53 -04:00
Axel Kohlmeyer 6c2dd7ebb1 pass the name of the python interpreter compatible with the python package to 'make install-python' 2017-04-14 11:44:36 -04:00
Richard Berger 9a027a01da Add Python 3 compatibility to PYTHON package 2017-04-11 20:24:42 -04:00
Steve Plimpton 49dd9449b8 fix gcmc updates from Aidan, trimming of output for replica commands 2017-04-11 08:35:09 -06:00
Tim Mattox 17c8e695a4 Merge branch 'master' into USER-DPD_kokkos as of patch 10 Mar 2017 2017-03-10 21:37:52 -05:00
Giacomo Fiorin 5fe6206638 Update Colvars module to version 2017-03-10 2017-03-10 09:16:58 -05:00
Christian Negre 3298c37982 Makefile.lammps.gfortran for latte 2017-03-09 14:30:21 -07:00
Stan Moore de27305227 Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos 2017-03-07 11:47:18 -07:00
Richard Berger e261bef7bb Spelling fixes in source files 2017-03-05 18:30:39 -05:00
Tim Mattox 641bf72f20 lib kokkos: Enable deterministic use of Random_XorShift*_Pool. 
Add support for lock-free and deterministic use of Random_XorShift*_Pool
by giving state_idx selection and lock responsibility up to the
application.  Done by an overload of get_state() to take sate_idx as
an argument that the appplication guarantees is concurrently unique
and within the range of num_states that the application passed to init().
In other words, this allows the RNG state to be associated with some
application specific index, rather than a runtime arbitrary thread ID,
and thus the application can control which work is performed using
which RNG in a deterministic manner, regardless of which thread
performs the work.
 2017-03-01 11:52:33 -05:00
Tim Mattox 6e26358ec3 lib kokkos bugfix: on a CUDA host, the random state wasn't preserved. 
Random_XorShift*_Pool<Kokkos::Cuda>::free_state() has two purposes:
1) update the state value kept in the pool
2) unlock the state
For a CUDA host thread, ONLY skip step 2, not both.
 2017-03-01 11:46:26 -05:00
Christian Negre 2dcbc805ba min latte partially fixed 2017-02-23 18:20:02 -07:00
Stan Moore 90e5ae965d Add missing flags to Kokkos Makefile 2017-02-13 11:19:46 -07:00
Stan Moore 33af7ab248 Remove merge line 2017-02-13 10:59:22 -07:00
Stan Moore 8f9b2aca06 Removing unused files in Kokkos lib 2017-02-13 10:53:51 -07:00
Stan Moore 383da816c2 Updating Kokkos lib 2017-02-13 10:50:34 -07:00
Christian Negre 6d47cf350c Makefile for latte_dev 2017-01-19 15:42:09 -07:00
sjplimp d8bc590aaf Merge pull request #327 from stanmoore1/kokkos_lib_update 
Updating Kokkos lib
 2017-01-17 09:04:12 -07:00
Christian Negre aaa7dca21b Makefile.lammps.gfortran 2017-01-12 17:13:02 -07:00
Christian Negre 6bd17be454 Makefile.lammps.gfortran 2017-01-12 16:58:27 -07:00
Christian Negre f51ddf8450 Makefile.lammps.gfortran 2017-01-12 13:50:02 -07:00
Stan Moore 7162cafdf5 Squelching output from Makefile 2017-01-10 14:46:30 -07:00
Stan Moore ee9e7cfbd5 Fixing Kokkos CUDA Makefile issue 2017-01-10 13:22:36 -07:00
Stan Moore 7839c335da Fixing compile error with Kokkos CUDA Makefiles 2017-01-10 13:05:00 -07:00
Christian Negre 1f6cfb1b31 Makefile.lammps.gfortran changed 2017-01-10 10:56:31 -07:00
Steve Plimpton c31f1e9f22 add fix mscg command, example, lib 2017-01-09 13:36:40 -07:00
Stan Moore 9250a55923 Adding enable_lambda to KOKKOS_CUDA_OPTIONS 2017-01-09 12:24:30 -07:00
Stan Moore a9f0b7d523 Updating Kokkos lib 2017-01-09 10:39:46 -07:00
Christian Negre 967cdd947e cleanup 2017-01-05 15:37:01 -07:00
Giacomo Fiorin b0263e87bb Fix missing force with extended-Lagrangian mass 2016-12-27 17:16:32 -05:00
Giacomo Fiorin f553e230db Update Colvars library to version 2016-12-22 
Significant code cleanup and several fixes (walls + extended Lagrangian)

New harmonicWalls bias to apply confining boundaries with time-dependent force
constant & integration
 2016-12-27 13:17:34 -05:00
Giacomo Fiorin 6ab716164b Fix seg fault for gyration collective variable 2016-12-27 13:17:02 -05:00
Giacomo Fiorin 7a45c72b97 Allow extended Lagrangian on non-scalar collective variables 2016-12-27 12:35:30 -05:00
Christian Negre fe99fc287d changes in fix_latte 2016-11-28 15:29:37 -07:00
Christian Negre f040f15218 changes in latte makefile for lattelib and README 2016-11-14 16:11:12 -07:00
Christian Negre f3d6ecf07b changes for lattelib 2016-11-14 07:58:47 -07:00
Steve Plimpton 6f23f6535c initial dummy version of fix_latte.cpp 2016-11-09 13:48:11 -07:00
Giacomo Fiorin 182141b850 Make SMP parallelism for Colvars optional 2016-10-24 17:13:34 -04:00
Giacomo Fiorin e02505c8cc Add ensemble-biased metadynamics (Fabrizio Marinelli, NIH) 2016-10-24 17:11:09 -04:00
Giacomo Fiorin be2d155cef Minor changes and fixes not relevant to LAMMPS 2016-10-24 17:10:52 -04:00
Giacomo Fiorin c243093980 Fix wall forces and subtractAppliedForce for extended-Lagrangian ABF 2016-10-24 17:05:47 -04:00
Giacomo Fiorin ad57a17f48 Add C-linkage wrapper for colvarscript (useful with ctypes) 2016-10-24 16:48:20 -04:00
Axel Kohlmeyer 019bc0ba0b fix typos in Makefile.lammps for NetCDF support 2016-10-19 07:39:03 -04:00
Axel Kohlmeyer 27796b431e avoid distracting error output 2016-10-18 15:32:20 -04:00
Axel Kohlmeyer 2b47fa6653 update Makefile.lammps and add README according to suggestions by lars pastewka 2016-10-18 15:05:30 -04:00
Axel Kohlmeyer 4502d3276b updated Makefile.lammps for NetCDF support based on suggestions from lars pastewka 2016-10-18 14:45:06 -04:00
Axel Kohlmeyer ecb03dd2df import lammps-netcdf code as USER-NC-DUMP package 2016-10-11 23:03:18 -04:00
Axel Kohlmeyer 683689c808 revert to previous style conventions for size_t constants 2016-10-08 11:00:23 -04:00
Axel Kohlmeyer e01e90eb96 workaround for double free issue when using USER-COLVARS with lammps code loaded as shared library into a standalone executable 2016-10-08 10:45:22 -04:00
sjplimp 54fc194e5b Merge pull request #199 from akohlmey/small-changes 
Collected small changes and bugfixes
 2016-10-06 15:49:24 -06:00
A Bartok-Partay 8ea063378e add NETCDF libs (as defined in QUIP) to the linking line if QUIP was built with NETCDF support 2016-10-06 12:16:25 +01:00
Giacomo Fiorin 8809a603fb Colvars update: issue a warning that cannot be ignored regarding total forces 2016-10-05 18:26:21 -04:00
Giacomo Fiorin 969d3cf4b0 Colvars update: make ABF check that the colvar isn't using already subtractAppliedForce 2016-10-05 18:25:40 -04:00
Axel Kohlmeyer 03766dbda7 apply bugfix for MEAM provided by Wolfgang Verestek on lammps-users 
this closes lammps/#188
 2016-10-03 16:28:59 -04:00
Axel Kohlmeyer a3e05a2bac permission cleanup 2016-10-01 06:34:45 -04:00
Axel Kohlmeyer 6d200061ca update colvars library to version 2016-09-30 2016-09-30 08:15:44 -04:00
Axel Kohlmeyer 5b2becd09b Merge branch 'integration' into new-master 2016-09-29 10:37:09 -04:00
sjplimp 484122b8b6 sync with GH 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15592 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2016-09-16 19:21:34 +00:00
Axel Kohlmeyer 9637a5b530 colvars bugfix. updates colvars library to version 2016-09-14 2016-09-15 19:44:26 -04:00
Axel Kohlmeyer 14bed44743 ignore Makefile.lammps in lib tree 2016-09-13 09:36:48 -04:00
Axel Kohlmeyer 18cacb8e1d ignore *.mod generated by fortran compilers 2016-09-13 09:36:19 -04:00
sjplimp b190abea39 sync with GH 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15561 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2016-09-08 20:20:32 +00:00
sjplimp 07e55ef61e Merge pull request #22 from akohlmey/colvars-update 
accumulated colvars library update and lib "make clean" improvement
 2016-09-08 14:14:49 -06:00
Steve Plimpton 236ebf7fab Kokkos lib update 2016-09-08 13:56:18 -06:00
Axel Kohlmeyer 3a74ccffa2 update colvars library to version 2016-09-03 
(cherry picked from commit 4181f5ac9d)
 2016-09-06 21:28:59 -04:00
Axel Kohlmeyer c8cfd53c1b adjust makefiles in lib tree, so they don't return an error exit code on "make clean" targets. 
(cherry picked from commit 4117218ca3)
 2016-09-06 21:28:55 -04:00
Axel Kohlmeyer 16607a0132 update colvars library to version 2016-08-19 
(cherry picked from commit c67326be6d)
 2016-09-06 21:27:46 -04:00
Axel Kohlmeyer 3b476d914f update colvars to version 2016-08-10 
(cherry picked from commit eba3ad9abb)
 2016-09-06 21:27:46 -04:00
Axel Kohlmeyer 977b9e542f update colvars to another set of changes from the upstream repo 
(cherry picked from commit cb816f8cba)
 2016-09-06 21:27:45 -04:00
Axel Kohlmeyer 1b33d00785 update colvars makefile dependencies 
(cherry picked from commit df99a85930)
 2016-09-06 21:27:45 -04:00
Axel Kohlmeyer 3d2e5d0a50 suppress compiler warning 
(cherry picked from commit 6f227e194e)
 2016-09-06 21:27:45 -04:00
Axel Kohlmeyer ec2a6b9f0d update colvars to version 2016-08-10 
(cherry picked from commit f2ddf828e4)
 2016-09-06 21:27:41 -04:00
Axel Kohlmeyer 77620106a4 update colvars library to version 2016-08-05 
(cherry picked from commit 459db2eb6b)

# Conflicts:
#	doc/src/PDF/colvars-refman-lammps.pdf
 2016-09-06 21:26:50 -04:00
stamoor 39be4185c4 Updating Kokkos lib 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15556 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2016-09-06 23:06:32 +00:00
stamoor 1ad033ec0c Updating Kokkos lib 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15555 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2016-09-06 23:02:50 +00:00
sjplimp 083ff54c0c small bug fixes 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15527 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2016-08-31 20:26:15 +00:00
Steve Plimpton 4051aedf2c Merge branch 'small' into integration 
Conflicts:
	src/compute_omega_chunk.cpp
 2016-08-31 13:58:12 -06:00
Steve Plimpton ec8b9e21db sync with SVN 2016-08-31 13:28:26 -06:00
stamoor dbaaf4dbbd Removing aggressive_vectorization flag due to safety issue 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15521 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2016-08-30 17:52:49 +00:00
Axel Kohlmeyer 493613b495 avoid NaNs in MEAM 2016-08-30 06:54:36 -04:00
Steve Plimpton 2beecd1e73 removal of doc/html/_sources and minor sync with SVN 2016-08-26 11:34:37 -06:00
stamoor cc4b2dd6ed Changing default 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15503 f3b2605a-c512-4ea7-a41b-209d697bcdaa
 2016-08-26 15:50:25 +00:00
Steve Plimpton abc5a32c8a gpu lib sync 2016-08-23 15:30:01 -06:00
sjplimp efaa84a4ea git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15430 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-08-03 19:32:03 +00:00