Commit Graph

374 Commits

Author SHA1 Message Date
8ac7aac620 fix merge commit 2022-08-08 17:40:28 -04:00
f9717049b1 Merge branch 'develop' into type-labels 2022-08-08 17:16:50 -04:00
e4c798674f Merge branch 'develop' into amoeba-ak 2022-07-02 22:02:07 -04:00
2d366ce220 add per-atom sp to extract() 2022-07-01 14:08:46 -06:00
97fab45f7e Merge branch 'develop' into amoeba-ak 2022-05-28 05:24:02 -04:00
71185b9f98 fix error message 2022-05-06 01:02:40 -04:00
929734ce45 Merge remote-tracking branch 'github/develop' into amoeba-ak
# Conflicts:
#	doc/src/Commands_pair.rst
#	src/memory.h
2022-04-28 20:08:18 -04:00
cf647347c9 Merge branch 'develop' into safer-data-file-parsing
# Conflicts:
#	src/atom.cpp
2022-04-22 22:25:41 -04:00
3b1021abd1 cosmetic changes. improve programming style conformance 2022-04-22 08:36:20 -04:00
55a7c341af improve data file section parsing
- avoid segfaults when dereferencing a null pointer on short files
- allow skipping over empty and comment-only lines.
2022-04-22 08:35:09 -04:00
6d56629660 improve error messages 2022-04-22 08:31:53 -04:00
89195363d6 whitespace 2022-04-18 21:20:13 -04:00
f8f2b9542e sync with current develop 2022-04-18 17:29:23 -06:00
111111b38b Merge branch 'develop' into atomvec-strings 2022-04-14 16:52:04 -04:00
ac8d97d358 capture by reference 2022-04-14 12:27:45 -04:00
31178661c9 switch to C++11 compatible lambda function capture 2022-04-14 12:27:03 -04:00
500a3426ed "stringify" and "vectorize" per-atom data handling in Atom class 2022-04-14 11:31:20 -04:00
c9ab5ebbf5 cosmetic 2022-04-13 12:59:54 -04:00
0f1097d7e6 recover read_restart and read_data capability for fix property/atom 2022-04-13 12:41:40 -04:00
ef4e41d2a2 programming style and format updates 2022-04-12 22:52:07 -04:00
f64d405ad8 Fixing remaining errors/warnings in doc build 2022-04-12 15:59:38 -06:00
36723853c9 Merge branch 'develop' into BPM 2022-04-11 12:18:34 -04:00
200b4f13c7 use dynamic cast instead of c-style cast when casting from base type to derived class 2022-04-10 18:18:06 -04:00
92a968a8a9 Resolving merge conflicts 2022-03-23 14:28:27 -06:00
e13a70ad2f Merge branch 'develop' into type-labels 2022-03-23 01:08:35 -04:00
f1d695299e simplify checking for intel neighbor list requests 2022-03-05 20:31:56 -05:00
642b1e25f6 Updating to develop 2022-02-18 13:58:38 -07:00
b42aebc197 silence compiler warnings 2022-02-13 18:19:50 -05:00
6a0e93a18a convert more style_creators to use local static functions 2022-02-11 18:29:52 -05:00
0bf941219f silence compiler warnings 2022-01-27 17:21:50 -05:00
19abc5d329 Merge branch 'develop' into BPM 2022-01-12 10:52:11 -07:00
ede7787741 Refactor Atom::data_bodies() 2022-01-04 11:56:56 -05:00
f557bf6e20 implement suggestion by @rbberger 2022-01-04 11:37:32 -05:00
c17a183816 do error checking already in read_data code 2021-12-31 14:34:09 -05:00
6d9764e140 add missing advance of buffer pointer 2021-12-31 00:14:52 -05:00
e6e9aed385 modernize/correct parsing for Bonus and Bodies sections 2021-12-30 22:58:14 -05:00
8d53cd1e5d modernize parsing of Velocities section of data files 2021-12-30 19:14:09 -05:00
7f2b505df3 apply utils overloads 2021-12-30 11:14:48 -05:00
64d6a2fd1f modernize parsing of the Atoms section 2021-12-29 20:24:27 -05:00
c97483c46f modernize parsing of the Masses section in data files 2021-12-29 19:36:18 -05:00
78df5c2258 modernize parsing of Bonds/Angles/Dihedrals/Impropers section of data files 2021-12-29 19:18:42 -05:00
44522221ad mass command, type label error check 2021-12-08 16:28:17 -05:00
5945e578b8 direct type label support for mass command 2021-12-08 16:04:22 -05:00
ddf97fa8fc tweak error messages 2021-11-24 15:34:43 -05:00
3fc47a9366 read_data: bond, etc. direct label support 2021-11-07 00:51:55 -04:00
9952526724 allow type labels for atom types in data file
allow strings for atom types in Atoms section!
bonds, etc. will be more elegant
2021-11-05 01:30:21 -04:00
8d4956046b Merge branch 'develop' of https://github.com/lammps/lammps into lammps-develop 2021-11-04 21:20:29 -04:00
f5626a2b9d Few more merge conflicts 2021-11-02 12:29:49 -06:00
d7f7835069 Fix merge conflicts, minor style fixes 2021-11-01 18:13:06 -06:00
c8512249b7 Merge branch 'develop' into modify-fix-compute-accessors
# Conflicts:
#	src/PLUGIN/plugin.cpp
2021-10-27 21:14:05 -04:00