Merge branch 'master' into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Stan Moore <stamoor@sandia.gov> Aug 23 2017, 23:20 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS5c985946d58f: Merge branch 'master' into USER-DPD_kokkos
rLAMMPSb6c93f96cfe0: Merge pull request #629 from stanmoore1/kokkos_update - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b6c93f96cfe0 | Steve Plimpton/GitHub | Merge pull request #629 from stanmoore1/kokkos_update | Aug 23 2017 | |||
| 7b7a5076d00a | Steve Plimpton/GitHub | Merge pull request #624 from akohlmey/compute-fragment | Aug 23 2017 | |||
| 1536eb5de549 | Steve Plimpton/GitHub | Merge pull request #630 from akohlmey/moltemplate-update | Aug 23 2017 | |||
| f7a0a6eb7069 | Steve Plimpton/GitHub | Merge pull request #622 from akohlmey/collected-small-fixes | Aug 23 2017 | |||
| d80a6cbd317a | Steve Plimpton/GitHub | Merge pull request #621 from lammps/user-meso | Aug 23 2017 | |||
| c4b37039ab88 | Steve Plimpton/GitHub | Merge pull request #619 from jrgissing/molecule_maxspecial | Aug 23 2017 | |||
| b52efa28507f | Axel Kohlmeyer | add compatibility to NetCDF 4.3.3 as bundled with RHEL 7.x | Aug 23 2017 | |||
| e88ff8d6f932 | Axel Kohlmeyer | correct embedded help for GPU lib Install.py | Aug 23 2017 | |||
| 97edf90a7389 | Axel Kohlmeyer | update fix qeq docs for the new, more flexible parameter file format | Aug 23 2017 | |||
| 12150ffa7397 | Axel Kohlmeyer | add moltemplate version 2017-8-22 | Aug 23 2017 | |||
| 57aafba7c3bd | Axel Kohlmeyer | remove old moltemplate version | Aug 23 2017 | |||
| cdfb1aa04375 | Axel Kohlmeyer | make links unique, fix doc format warnings and add entries to administrative… | Aug 23 2017 | |||
| b80752a40c56 | Axel Kohlmeyer | restore changes to read_data docs, that would have been lost due to merging an… | Aug 23 2017 | |||
| 79d5ca669dcb | Axel Kohlmeyer | fix issues indicated by compiler warnings | Aug 23 2017 | |||
| 26c15140be20 | Axel Kohlmeyer | add USER-MESO files to .gitignore | Aug 23 2017 | |||
| 090c792d9070 | Stan Moore | Update Kokkos library to v2.04.00 | Aug 22 2017 | |||
| 24c00b1f7a20 | Axel Kohlmeyer | fix typo | Aug 21 2017 | |||
| 5a0c3aea8ac1 | Axel Kohlmeyer | add a compute aggregate/atom, that combines the rules for compute cluster/atom… | Aug 21 2017 | |||
| d1a0c040c9f8 | Axel Kohlmeyer | add initializers for nmatch/nwant variables in molecule file parser | Aug 21 2017 | |||
| f5b8f722eee3 | Axel Kohlmeyer | remove non-portable non-ascii blanks from fix wall/ees docs | Aug 20 2017 | |||
| 39e51df2c004 | Axel Kohlmeyer | add missing entry in pdf manual | Aug 20 2017 | |||
| c895df73d624 | Axel Kohlmeyer | skip over disabled bonds | Aug 20 2017 | |||
| 4dc1195cd851 | Axel Kohlmeyer | add docs for compute fragment/atom | Aug 20 2017 | |||
| 35fd82b60282 | Axel Kohlmeyer | trim unneeded includes | Aug 20 2017 | |||
| c5ce3ffe60e4 | Axel Kohlmeyer | use list of bonds per atom instead of bondlist, as that will work with shake as… | Aug 20 2017 | |||
| aa1ce09b1264 | Axel Kohlmeyer | more cleanup, checks and generalization of QEQ parameter file parsing | Aug 19 2017 | |||
| f945d4567d4f | Steve Plimpton | new USER-MESO package | Aug 19 2017 | |||
| 44ccdb86df24 | Axel Kohlmeyer | add checks when reading QEQ parameter file to avoid segfaults and memory… | Aug 19 2017 | |||
| 2e6a928aa315 | Axel Kohlmeyer | ignore file recently added to USER-INTEL | Aug 19 2017 | |||
| 6f66e6c45445 | Axel Kohlmeyer | add new compute fragment/atom | Aug 19 2017 | |||
| d671a04274f9 | Axel Kohlmeyer | whitespace cleanup | Aug 18 2017 | |||
| bf7cff73d42a | Axel Kohlmeyer | allocate the temporary special array on the heap and not the stack (it may get… | Aug 18 2017 | |||
| 9e85b3178a14 | jrgissing | molecule maxspecial value corrected when specials autogenerated | Aug 18 2017 |