Commit Graph

11110 Commits

Author SHA1 Message Date
f0935feabe Merge pull request #1868 from akohlmey/next_patch_version
Step version strings for next patch release
2020-02-03 11:50:12 -05:00
73364404a1 Step version strings for next patch release 2020-02-03 07:18:31 -05:00
2b6a022309 Merge branch 'master' into fft-consistency 2020-01-31 20:51:58 -05:00
b524db88a3 Merge remote-tracking branch 'github/master' into adaptglok
# Conflicts:
#	doc/src/min_modify.rst
2020-01-31 12:24:59 -05:00
56ff70de70 Merge pull request #1860 from akohlmey/collected-small-changes
Collected small changes for next patch release
2020-01-31 12:21:17 -05:00
39188da85b Merge pull request #1857 from ohenrich/user-cgdna
USER-CGDNA: Increased tolerance for fatal error in FENE bond
2020-01-31 12:20:57 -05:00
82aab36898 reset array size since we don't use the last element anymore 2020-01-31 09:59:35 -05:00
2069c7a5fd correct incorrect bugfix 2020-01-31 09:58:04 -05:00
31c4833707 correct out-of-bounds array access in RanMars::select_subset() 2020-01-31 09:51:23 -05:00
82286702cb switch OpenMP pragma to default(shared), so it is compatible with all OpenMP standard versions 2020-01-31 08:32:14 -05:00
c732ccc0f8 remove trailing whitespace 2020-01-30 17:02:06 -05:00
f872d374a0 Merge branch 'adaptglok' of github.com:jguenole/lammps into adaptglok 2020-01-30 17:00:10 -05:00
6369ab230e make inclusion guard defines consistent with LAMMPS and avoid redefinition of MAX() 2020-01-30 16:56:02 -05:00
9fade740fb Fix issue with Kokkos FFT_CUFFT 2020-01-30 13:27:36 -07:00
a50563d582 Fix issue with Kokkos FFTW3 2020-01-30 13:03:15 -07:00
4ea9dea19c More Kokkos FFT refactor 2020-01-30 12:04:57 -07:00
ef30d0ed7b Add missing endif 2020-01-29 17:32:25 -07:00
f8e2543c44 Move FFT data types out of kokkos_type.h 2020-01-29 17:15:47 -07:00
1851a9f7d4 Refactor Kokkos FFT_DATA 2020-01-29 16:21:33 -07:00
0613790b6b support having the keyword special multiple times after pair in pair_modify 2020-01-29 17:23:11 -05:00
0d0c5e2961 make KOKKOS and KSPACE FFT3d code more consistent and remove redundant code 2020-01-29 16:37:29 -05:00
ccd395fdd8 remove dead code 2020-01-29 14:34:03 -05:00
426ca97aa6 correct bug introduced in previous commit 2020-01-29 17:53:10 +01:00
1e7f09bded removing deprecated functions in log comment 2020-01-29 17:50:56 +01:00
c855bbb6bf Merge branch 'master' into adaptglok 2020-01-29 11:42:25 -05:00
9427fc50a5 Update Colvars library to version 2020-01-27
One new feature (arithmetic path variables) and several smaller enhancements
or bugfixes.

    Fix error check when loading an old state file
    https://github.com/Colvars/colvars/pull/317

    Get default values for grid boundaries when available
    https://github.com/Colvars/colvars/pull/310

    Allow redefining existing index groups (warn when this happens)
    https://github.com/Colvars/colvars/pull/302

    Simplified replica communication syntax in metadynamics
    https://github.com/Colvars/colvars/pull/301

    Obtain the bias_energy for ABF biases
    https://github.com/Colvars/colvars/pull/294

    Fix reading path file with vector CVCs
    https://github.com/Colvars/colvars/pull/288

    Fix segfault at deleting CVBasedPath
    https://github.com/Colvars/colvars/pull/286

    Parrinello's (arithmetic) pathCV in CV space
    https://github.com/Colvars/colvars/pull/274

    Fix race condition when starting a bundle of walkers
    https://github.com/Colvars/colvars/pull/279
2020-01-28 14:15:05 -05:00
197ba62cd9 Change fire to fire/old and fire2 to fire. Implement normstyle in fire. Update author affiliation. 2020-01-28 14:51:23 +01:00
795f2fd894 properly support threaded FFTs with MKL and document it. remove commented out FFTW2 code 2020-01-27 11:00:57 -05:00
4134d7fddd Merge pull request #1854 from akohlmey/next_patch_release
Update version string for the next patch release
2020-01-24 20:58:03 -05:00
669980388a Merge branch 'fft' of ssh://github.com/stanmoore1/lammps into fft 2020-01-24 14:33:31 -07:00
76aaf16c66 Add check for FFT_FFTW_THREADS and turn off MKL threads for now 2020-01-24 14:30:11 -07:00
e9d4823d71 Add cuFFT to Makefile.lassen_kokkos and generalize MPI path 2020-01-24 13:56:00 -07:00
899a654161 Merge branch 'master' into user-cgdna 2020-01-24 14:21:55 +00:00
23febc7101 Increased tolerance for fatal error in FENE bond argument 2020-01-24 14:19:18 +00:00
cb5138a335 update version string for the next patch release 2020-01-23 12:00:33 -05:00
df23460e18 Merge branch 'master' into fft
# Conflicts:
#	src/MAKE/OPTIONS/Makefile.kokkos_cuda_mpi
2020-01-23 00:22:38 -05:00
30444b344b Merge pull request #1853 from akohlmey/collected-small-changes
Collected small changes and bugfixes for the next patch release
2020-01-22 17:25:03 -05:00
8096a78340 Merge pull request #1852 from vklip/bugfix-gjf
Add unit conversion in setup() in fix_langevin.cpp
2020-01-22 17:22:01 -05:00
949d7608ba Merge pull request #1811 from brycelelbach/bug/missing_execution_space_qualifiers
Fix mismatches in CUDA execution space qualifiers between declarations and definitions.
2020-01-22 17:10:11 -05:00
5488efbc03 fix typo, update maintainer. 2020-01-22 17:00:10 -05:00
70731468df include "pppm.h" last so that necessary KOKKOS config define is available 2020-01-22 16:32:32 -05:00
9d06430894 Merge pull request #603 from jrgissing/Ncreate_atoms
add exactly N particles to available lattice points
2020-01-22 15:36:54 -05:00
61ddf9bcd8 undo accidental edit of KOKKOS cuda mpi makefile 2020-01-22 15:32:00 -05:00
70b9a060dc add missing #endif 2020-01-22 15:26:34 -05:00
9a27aa4e9e Merge branch 'master' into fft
# Conflicts:
#	src/MAKE/OPTIONS/Makefile.kokkos_cuda_mpi
2020-01-22 15:21:08 -05:00
dfda8b5ce6 fix up LMP_FFT_LIB for reporting FFT lib in use for KOKKOS with CUDA logic 2020-01-22 15:18:59 -05:00
40e0e78abd import template atom ID check from PR #1822 2020-01-22 15:02:55 -05:00
bb024bc077 add call to KSpace::two_charge() that was overlooked 2020-01-22 14:46:57 -05:00
48cae2703b move memory allocation for atom style variable data where it belongs and cannot be skipped
this fixes the bug reported on lammps-users on 2020-01-22 by Olivier Politano
2020-01-22 14:34:12 -05:00
cc81dc2046 remove redundant initializers 2020-01-22 14:32:34 -05:00