Commit Graph

17514 Commits

Author SHA1 Message Date
856c325ac4 Merge pull request #1273 from akohlmey/rename-lebedeva
Rename pair style lebedeva to lebedeva/z
2019-01-03 19:43:08 -05:00
7323179de3 rename pair style lebedeva to lebedeva/z to be consistent with kolmolgorov/crespi/z 2019-01-03 17:30:16 -05:00
19e12aada5 Patch release 4 January 2019 2019-01-03 13:44:18 -05:00
abcba913ab Merge pull request #1242 from akohlmey/collected-post-stable-patches
Collected post stable patches
2019-01-03 13:20:28 -05:00
f96f98241c replace outdated moltemplate distribution with README explaining how to install the latest version 2019-01-03 00:39:58 -05:00
41ccf832bf update log files 2018-12-30 04:30:58 -05:00
6d5ab3dac1 Merge branch 'github-rebo-bugfix' of https://github.com/CF17/lammps into test-rebo
# Conflicts:
#	examples/airebo/log.23Jun17.airebo-m.g++.1
#	examples/airebo/log.23Jun17.airebo-m.g++.4
#	examples/airebo/log.23Jun17.airebo.g++.1
#	examples/airebo/log.23Jun17.airebo.g++.4
#	examples/airebo/log.27Nov18.airebo-m.g++.1
#	examples/airebo/log.27Nov18.airebo-m.g++.4
#	examples/airebo/log.27Nov18.airebo.g++.1
#	examples/airebo/log.27Nov18.airebo.g++.4
#	examples/airebo/log.29Jun18.airebo-m.g++.1
#	examples/airebo/log.29Jun18.airebo-m.g++.4
#	examples/airebo/log.29Jun18.airebo.g++.1
#	examples/airebo/log.29Jun18.airebo.g++.4
2018-12-30 03:44:38 -05:00
fd18660463 Merge branch 'collected-small-changes' into collected-post-stable-patches 2018-12-29 17:08:32 -05:00
1991ff6c48 consistent formatting: replace "if( XXX)" with "if (XXX)" 2018-12-29 17:08:12 -05:00
f25bfd5931 consistent formatting: replace "if( XXX )" with "if (XXX)" 2018-12-29 17:04:28 -05:00
6e866f82a7 correct typo (missing increment operator) in fix bond/react 2018-12-29 16:31:44 -05:00
01163c9ae8 correct error in Purge.list for removed files of the REAX package 2018-12-29 16:30:38 -05:00
e7361728a1 Merge branch 'collected-small-changes' into collected-post-stable-patches 2018-12-29 14:51:31 -05:00
37a597cc0f Merge branch 'master' into collected-post-stable-patches 2018-12-29 14:51:21 -05:00
2e70541134 consistent formatting: replace '}else' with '} else' 2018-12-29 14:50:26 -05:00
991ca25dd7 consistent formatting: adjust cases of "dangling else", add curly braces 2018-12-29 14:47:50 -05:00
444dcca433 Merge pull request #1254 from akohlmey/remove-reax-meam
Remove REAX and MEAM packages
2018-12-29 13:06:07 -05:00
25a4fd4793 Merge pull request #1262 from evoyiatzis/evoyiatzis-patch-1
Addition of extract() method for class2 pair potentials
2018-12-29 13:05:38 -05:00
dd6688609d Merge pull request #1259 from athomps/npt-econs-varv
Fix two problems with NPT: volume fluctuations (with iso, previously with aniso/tri) and energy conservation (with aniso/tri)
2018-12-29 13:05:25 -05:00
4725d4be20 Merge pull request #1255 from stanmoore1/sllod
Change fix nvt/sllod to allow suffix styles of fix deform
2018-12-29 13:05:06 -05:00
9355e7e5cc Merge pull request #1243 from athomps/snap-foundtest
Removed redundant element list from pair_coeff snap syntax
2018-12-29 13:04:47 -05:00
cf3aee06f3 Merge pull request #1239 from jrgissing/bond/react-delete_atoms
fix bond/react: allow deleting atoms
2018-12-29 13:04:23 -05:00
bad7be4126 Merge pull request #1265 from junghans/linux_doc
Update pre-packaged LAMMPS for linux docs
2018-12-29 12:54:45 -05:00
08455b9cc3 Merge pull request #1267 from evoyiatzis/patch-1
add "mixing rule" check for inconsistent lambda in init_one() method of lj/cut/soft
2018-12-29 12:36:20 -05:00
c588b44cf1 consistent formating: replace "} else{" with "} else {" 2018-12-29 12:35:01 -05:00
31427a2380 consistent formatting: replace "if( XXX ){" with "if (XXX) {" 2018-12-29 12:32:59 -05:00
7177c541d4 consistent source format: replace '}else{' with '} else {' 2018-12-29 12:20:24 -05:00
dd028e9071 Merge pull request #1266 from junghans/cmake_doc
doc: add CMAKE_VERBOSE_MAKEFILE and CXX_COMPILER_LAUNCHER
2018-12-29 12:09:06 -05:00
484b4f2f0e Merge pull request #1268 from junghans/cmake_install
cmake: adjust install location of FindLAMMPS.cmake
2018-12-29 12:08:00 -05:00
89ca07c76e Merge branch 'collected-small-changes' into collected-post-stable-patches 2018-12-29 12:05:30 -05:00
92e1cbe788 cmake: find install location of FindLAMMPS.cmake 2018-12-28 17:57:13 -07:00
3a7350575c tweak coeff argument parsing settings for lj/class2/coul/long 2018-12-28 17:38:55 -05:00
99ace5b435 "mixing rule" for lambda in init_one() method
The values of the lambda[i][j] were equal to zero and different from lambda[i][i] when the user was not using explicit pair_coeff commands for the i-j pairs in the input script. The "mixing rule" included in this file is the same with the one in the pair_lj_cut_coul_cut_soft.cpp and pair_lj_cut_coul_long_soft.cpp files.
2018-12-28 11:21:13 +01:00
b19ee27f86 initialize two more struct Tree members to appease coverity scan 2018-12-28 01:01:33 -05:00
2d4411130f ensure that binsize is initialized in all cases 2018-12-28 01:01:07 -05:00
cc1c93a3d9 correct broken formatting and add explicit links to ParmEd and InterMol, a few tweaks 2018-12-28 00:29:40 -05:00
7b4d0092b0 Added type- and form-dependent conditionals in PairGranular::compute,
still some issues with overall structure of the code.
2018-12-22 14:33:09 -07:00
71ed60ced3 More work on compute method for generalized pair granular 2018-12-21 15:41:46 -07:00
009d8c8ebf Added parsing to pair_coeff, added for for init_one 2018-12-21 09:29:47 -07:00
7861de03a2 Progress on general granular pair style 2018-12-20 16:59:21 -07:00
f8a5a78c2c doc: add CMAKE_VERBOSE_MAKEFILE and CXX_COMPILER_LAUNCHER 2018-12-20 09:17:34 -07:00
e2d871ac23 update Fedora rpm docu 2018-12-20 09:01:44 -07:00
6ebef96c23 Gentoo is not pre-built 2018-12-20 08:58:32 -07:00
fd8130859b fix a small memory leak in SHAKE setup 2018-12-19 17:40:35 -07:00
8cc4354894 Optimize Kokkos SNAP energy calculation 2018-12-19 17:11:54 -07:00
685ed827d7 small formatting changes 2018-12-19 06:46:19 -05:00
5fb8f23cb4 update false positives list for recent manual changes 2018-12-19 02:24:16 -05:00
ba3ee71edf update the github workflow checklist with a missing requirement 2018-12-19 02:09:31 -05:00
caba050f29 update list of items to check for contributing code to current status 2018-12-19 02:03:27 -05:00
67782d71a8 Granular pair style files added 2018-12-18 21:23:04 -07:00