Commit Graph

228 Commits

Author SHA1 Message Date
b41d826e0a Merge branch 'develop' into gran-temp 2023-03-16 17:44:36 -04:00
694b1b5748 remove Fortran library based MESONT styles and the library itself 2023-01-20 19:12:42 -05:00
f175a15627 Merge branch 'develop' into gran-temp 2023-01-10 09:58:50 -07:00
652c237b5e Merge branch 'upstream' into dielectric-updates 2022-12-25 15:13:46 -06:00
a3c0be875e include-what-you-use updates 2022-12-11 22:46:54 -05:00
86c2ae6dab Switched to using q_scaled, keeping q as the real, unscaled charges 2022-12-09 23:34:49 -06:00
f671cd7765 Merge branch 'develop' into gran-temp 2022-11-01 14:10:28 -06:00
2132b1d904 update developer reference text 2022-10-24 11:08:26 -04:00
cccf3f6f78 change email for contacting LAMMPS developers, add to homepage checker 2022-10-20 20:36:03 -04:00
cca7a53132 Patching heat implementation and adding example 2022-09-25 14:53:53 -06:00
7e6bd892ed apply clang-format 2022-09-10 03:29:32 -04:00
9b41d28947 Merge branch 'develop' into type-labels
# Conflicts:
#	doc/src/dihedral_coeff.rst
2022-09-01 21:09:04 -04:00
b6ce6755d9 add Atom::get_style() method 2022-08-27 16:13:00 -04:00
4b842d52e6 Merge branch 'develop' into type-labels 2022-08-22 10:45:48 -04:00
92c9614429 Merge branch 'develop' into refactor-find-xxx
# Conflicts:
#	src/atom.h
#	src/compute_centroid_stress_atom.cpp
2022-08-17 15:48:26 -04:00
3c744772b8 add new api to access molecules. 2022-08-13 16:02:50 -04:00
2eb6ff1111 allow const char * argument 2022-08-11 03:45:56 -04:00
eb4ce25f03 finish rolling back multiple maps feature 2022-08-09 11:32:29 -04:00
363b80f85c begin unfeaturing multiple label maps feature 2022-08-09 01:01:31 -04:00
f9717049b1 Merge branch 'develop' into type-labels 2022-08-08 17:16:50 -04:00
c6d59fc526 adding documentation and integration fix 2022-06-12 10:09:26 -06: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
78c10bac4a clang-format update 2022-04-23 13:08:11 -04:00
79a7d2abf6 remove error docs from header files 2022-04-22 23:31:15 -04:00
aed7bafac0 Merge pull request #3217 from akohlmey/atomvec-strings
Refactor Atom and AtomVec classes to use std::string and std::vector for setting up per-atom data
2022-04-22 22:03:26 -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
f40b8f5694 Merge branch 'develop' into dielectric-updates 2022-04-17 17:47:55 -04:00
111111b38b Merge branch 'develop' into atomvec-strings 2022-04-14 16:52:04 -04:00
500a3426ed "stringify" and "vectorize" per-atom data handling in Atom class 2022-04-14 11:31:20 -04:00
b05aadf877 Allowed to set the atom local dielectric values (epsilon) 2022-04-11 14:18:43 -05:00
e13a70ad2f Merge branch 'develop' into type-labels 2022-03-23 01:08:35 -04:00
642b1e25f6 Updating to develop 2022-02-18 13:58:38 -07:00
6a0e93a18a convert more style_creators to use local static functions 2022-02-11 18:29:52 -05:00
b8d4030983 Update more core class destructors 2022-01-19 13:27:08 -05:00
a7a8581662 write_data: directly replace types w labels
allow direct replacement of numeric atom types in Atoms sections with type labels, using new keyword
2021-11-05 23:03:55 -04:00
8d4956046b Merge branch 'develop' of https://github.com/lammps/lammps into lammps-develop 2021-11-04 21:20:29 -04:00
d7f7835069 Fix merge conflicts, minor style fixes 2021-11-01 18:13:06 -06:00
f4851e9103 change check for reset image flags to print messages only once per data file 2021-10-13 21:54:18 -04:00
67ae6eb7b6 Merge branch 'lammps:master' into type-labels 2021-09-30 09:44:18 -04:00
5be5a158de passing strings by reference 2021-09-01 12:33:47 -05:00
d2984d2615 Merge branch 'master' into BPM 2021-08-27 10:04:04 -06:00
bb720626e3 Adding files for BPM 2021-08-27 09:22:56 -06:00
b2b807f9b9 initial version of AMOEBA/HIPPO force field files 2021-08-25 13:53:31 -06:00
8f71979ba1 update formatting in src folder with clang-format 2021-08-23 20:46:09 -04:00
2a06484511 Merge branch 'master' of https://github.com/lammps/lammps into lammps-master2 2021-08-20 10:53:04 -04:00
e6af1eecb8 resolved merge conflicts with master 2021-08-17 11:55:33 -06:00
e6181d14d7 Use latest versions in master branch 2021-07-15 13:53:15 +01:00
e99b8ed07c Merge branch 'master' into cg-dna 2021-07-15 13:37:24 +01:00
89d7e34540 destructor in polymorph base class should be virtual 2021-07-10 10:53:36 -04:00