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

466 Commits

Author SHA1 Message Date
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
Giacomo Fiorin 5fe6206638 Update Colvars module to version 2017-03-10 2017-03-10 09:16:58 -05:00
Richard Berger e261bef7bb Spelling fixes in source files 2017-03-05 18:30:39 -05: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
sjplimp d8bc590aaf Merge pull request #327 from stanmoore1/kokkos_lib_update 
Updating Kokkos lib
 2017-01-17 09:04:12 -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
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
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
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