Commit Graph

19562 Commits

Author SHA1 Message Date
4134d7fddd Merge pull request #1854 from akohlmey/next_patch_release
Update version string for the next patch release
patch_24Jan2020
2020-01-24 20:58:03 -05:00
da35840cd9 Merge pull request #1520 from stanmoore1/fft
Add threaded FFTs to the KOKKOS package
2020-01-24 18:21:33 -05:00
9d333c351a Small clarification to kspace_style.rst 2020-01-24 14:42:40 -07: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
cb5138a335 update version string for the next patch release 2020-01-23 12:00:33 -05:00
f14b200b6a correct KOKKOS FFT output for CMake summary one more time 2020-01-23 00:27:00 -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
c126df4f79 update KOKKOS FFT status message in CMake summary 2020-01-22 17:08:58 -05:00
5488efbc03 fix typo, update maintainer. 2020-01-22 17:00:10 -05:00
53554fdb84 add -DFFT_CUFFT for KOKKOS only when KISSFFT is not selected 2020-01-22 16:56:12 -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
8a1f893b43 repair incorrect conversions on [*] expressions by txt2rst 2020-01-22 13:20:04 -05:00
37e8195b01 fix whitespace issue 2020-01-22 12:44:24 -05:00
a87c7a4a53 avoid segfault 2020-01-22 12:41:59 -05:00
64a4bf6a42 Merge pull request #1850 from lammps/kspace-bugfix
move two_charge_force calc to occur at init, not constructor, fix small bug in pair style extep
2020-01-22 12:38:33 -05:00
0623859f36 fix small bug in pair style extep 2020-01-22 11:25:13 -05:00
0ae40c5967 Add unit conversion in setup() 2020-01-22 17:13:10 +01:00
ac143dbdb7 capitalize comment 2020-01-21 17:57:12 -07:00
11f687c1fb make comment string consistent 2020-01-21 17:56:00 -07:00
b29ffabe56 move two_charge_force calc to occur at init, not constructor 2020-01-21 14:24:55 -07:00
f7dc70a986 add new error/warning messages to documentation 2020-01-21 16:05:55 -05:00
a6f59a8607 Merge remote-tracking branch 'github/master' into Ncreate_atoms
# Conflicts:
#	src/create_atoms.cpp
2020-01-21 15:52:01 -05:00
646dc83394 remove trailing whitespace 2020-01-21 15:46:28 -05:00
7728c5069f Merge pull request #1845 from akohlmey/collected-small-changes
Collected small changes for next patch release
2020-01-21 15:45:41 -05:00
d83cf8e4b0 add Jake's name as contributor 2020-01-21 13:36:36 -07:00
90ff2eb6c9 modified versions of creating atoms on subset of lattice, ditto for set type/fraction 2020-01-21 13:31:47 -07:00
4ea679dd54 Merge branch 'master' into nparticles 2020-01-21 13:26:03 -07:00
405eb63a51 update sphinx extension to automatically pad lists to fill tables and avoid errors processing the documentation 2020-01-21 11:39:29 -05:00
3db920b8a6 fix minor issues with docs 2020-01-20 17:03:54 -05:00
12de17621f Merge branch 'master' into collected-small-changes
# Conflicts:
#	doc/src/Commands_fix.rst
2020-01-20 16:59:42 -05:00
795a872bf3 Merge pull request #1847 from pdebuyl/fix-active
Add fix propel/self
2020-01-20 16:57:04 -05:00
f03cfba029 Merge pull request #1820 from ornladios/adios_read_dump
Support read_dump with dump style 'adios'
2020-01-20 16:27:09 -05:00
946bd8f3c0 print warning about adjusting the communication cutoff only during integrator or minimizer setup phase 2020-01-20 16:23:26 -05:00
41cfb91d7d Reformat README and mention about the timeout option 2020-01-20 15:55:31 -05:00
7766b29c97 replace strncmp by strcmp 2020-01-20 21:54:29 +01:00
44a814ec1d Added 'timeout <value>' option to the adios reader, so that a rerun can concurrently run with the first simulation 2020-01-20 15:52:21 -05:00