Commit Graph

4586 Commits

Author SHA1 Message Date
2881f95d7a Merge branch 'cg-dna' of https://github.com/ohenrich/lammps into cg-dna 2021-07-19 11:23:50 +01:00
15b3b6445e Updated tests and documentation, added warning message 2021-07-19 11:22:06 +01:00
536ba492fb error out on trying to dump strings or variables 2021-07-18 17:47:01 -04:00
57df891572 avoid duplicate label 2021-07-17 07:49:41 -04:00
fa654f2270 add support for set_vector for fix external in c-library, python and unittest 2021-07-16 23:41:25 -04:00
f3dc13c9dd expand library interface for fix external functionality 2021-07-16 17:29:15 -04:00
fb1e757524 Merge branch 'lammps:master' into cg-dna 2021-07-16 12:58:26 +01:00
b7a17dc25d Added warning message in documentation and dsDNA ring test in examples 2021-07-16 12:57:21 +01:00
741e13743c Merge branch 'master' into refactor-reaxff-parser 2021-07-15 17:23:56 -04:00
95792ac928 Merge pull request #2833 from athomps/delete-last-mol
Delete last mol
2021-07-15 17:16:48 -04:00
dc70f97ad4 restore changes from upstream that were undone by incorrectly resolving merge conflicts 2021-07-15 15:44:35 -04:00
d97ea4ebf6 make dependency of CG-DNA on ASPHERE and MOLECULE a hard dependency 2021-07-15 15:42:50 -04:00
e99b8ed07c Merge branch 'master' into cg-dna 2021-07-15 13:37:24 +01:00
fb73382c94 Documented restriction on molecular count >= 1 for fix rigid 2021-07-14 11:13:54 -06:00
757e2f8cff Merge branch 'master' into refactor-reaxff-parser
# Conflicts:
#	doc/src/fix_qeq_reax.rst
#	src/OPENMP/reaxc_bond_orders_omp.h
#	src/OPENMP/reaxc_bonds_omp.h
#	src/OPENMP/reaxc_forces_omp.h
#	src/OPENMP/reaxc_hydrogen_bonds_omp.h
#	src/OPENMP/reaxc_init_md_omp.cpp
#	src/OPENMP/reaxc_init_md_omp.h
#	src/OPENMP/reaxc_multi_body_omp.h
#	src/OPENMP/reaxc_nonbonded_omp.h
#	src/OPENMP/reaxc_torsion_angles_omp.h
#	src/OPENMP/reaxc_valence_angles_omp.h
#	src/OPENMP/reaxff_omp.h
#	src/Purge.list
#	src/QEQ/fix_qeq.cpp
#	src/QEQ/fix_qeq.h
#	src/QEQ/fix_qeq_dynamic.cpp
#	src/QEQ/fix_qeq_fire.cpp
#	src/REAXFF/fix_qeq_reax.cpp
#	src/REAXFF/reaxc_allocate.h
#	src/REAXFF/reaxc_bond_orders.h
#	src/REAXFF/reaxc_bonds.h
#	src/REAXFF/reaxc_control.h
#	src/REAXFF/reaxc_defs.h
#	src/REAXFF/reaxc_ffield.h
#	src/REAXFF/reaxc_forces.h
#	src/REAXFF/reaxc_hydrogen_bonds.h
#	src/REAXFF/reaxc_init_md.cpp
#	src/REAXFF/reaxc_init_md.h
#	src/REAXFF/reaxc_io_tools.cpp
#	src/REAXFF/reaxc_io_tools.h
#	src/REAXFF/reaxc_list.h
#	src/REAXFF/reaxc_lookup.h
#	src/REAXFF/reaxc_multi_body.h
#	src/REAXFF/reaxc_nonbonded.h
#	src/REAXFF/reaxc_reset_tools.h
#	src/REAXFF/reaxc_system_props.cpp
#	src/REAXFF/reaxc_system_props.h
#	src/REAXFF/reaxc_tool_box.h
#	src/REAXFF/reaxc_torsion_angles.h
#	src/REAXFF/reaxc_traj.cpp
#	src/REAXFF/reaxc_traj.h
#	src/REAXFF/reaxc_types.h
#	src/REAXFF/reaxc_valence_angles.h
#	src/REAXFF/reaxc_vector.cpp
#	src/REAXFF/reaxc_vector.h
#	src/REAXFF/reaxff_api.h
#	src/REAXFF/reaxff_defs.h
#	src/REAXFF/reaxff_inline.h
#	src/REAXFF/reaxff_types.h
#	src/text_file_reader.cpp
#	src/text_file_reader.h
#	unittest/force-styles/tests/atomic-pair-reax_c.yaml
#	unittest/force-styles/tests/atomic-pair-reax_c_lgvdw.yaml
#	unittest/force-styles/tests/atomic-pair-yukawa_colloid.yaml
2021-07-12 14:25:47 -04:00
0540ce547b Merge branch 'master' into package-reorganization2 2021-07-12 11:45:27 -04:00
6134164ad3 pair style rann does not support per-atom stress or pair_modify nofdotr 2021-07-11 20:03:52 -04:00
9898941169 update tersoff docs about tersoff/intel requiring intel compilers 2021-07-11 08:00:01 -04:00
6571a84884 move some styles around 2021-07-09 16:54:00 -04:00
b2a396da3c Merge pull request #2828 from tomswinburne/snap-scale
Adding scale parameter to pair/snap for fix/adapt
2021-07-07 16:10:11 -04:00
46d5d9724a move interlayer potentials to their own package 2021-07-07 15:52:53 -04:00
39bd342913 Resolved conflict 2021-07-07 10:04:05 +01:00
c9ddee5e38 Merge pull request #2824 from ndtrung81/dielectric-updates
Updates to the DIELECTRIC package
2021-07-06 20:58:23 -04:00
91790e8586 Update Commands_kspace.rst 2021-07-06 20:21:34 -04:00
d041e5cba0 we require at least zstd API version 1.4 2021-07-06 13:39:07 -04:00
71f82e81d7 Merge branch 'snap-scale' into fm 2021-07-06 17:23:24 +02:00
3675bef2b0 doc 2021-07-06 14:06:27 +02:00
4b81802ae8 Created new feature branch for PR as per request 2021-07-05 16:07:40 +01:00
f84ab6f26b clarify fix nve impact 2021-07-04 19:21:09 -04:00
4b42b51006 fix broken links 2021-07-03 16:23:55 -04:00
b314c83266 fix up mistyped package names 2021-07-03 16:19:15 -04:00
c61480eace fix indexing for pppm/disp/dielectric 2021-07-03 16:12:52 -04:00
da06535be5 fix doc build warnings 2021-07-03 16:06:43 -04:00
de3ac9d440 update for package rename in upstream 2021-07-03 15:38:24 -04:00
430e7e962f Merge branch 'master' into dielectric-updates
# Conflicts:
#	src/DIELECTRIC/Install.sh
#	src/DIELECTRIC/pppm_disp_dielectric.cpp
#	src/DIELECTRIC/pppm_disp_dielectric.h
2021-07-03 15:27:57 -04:00
bee95e41ae Added references to example input scripts to the doc pages 2021-07-02 14:06:06 -05:00
48d3acb52b Updated the doc pages for the /dielectric styles 2021-07-02 13:45:08 -05:00
2a21c4b29f add sticker-bond support to fix bond/swap 2021-07-02 11:46:25 -06:00
34fa0da60e Merge branch 'master' into package-reorganization-step1
# Conflicts:
#	doc/src/Packages_details.rst
2021-07-02 13:24:49 -04:00
411d1f1240 move fix imd from USER-MISC to MISC 2021-07-02 13:19:47 -04:00
bf5934e581 Merge pull request #2795 from jtclemm/fabric
Add fabric tensor compute
2021-07-01 21:59:48 -04:00
58196d57f1 New package DPD-BASIC with pair styles dpd, dpd/tstat, dpd/ext, dpd/ext/tstat 2021-07-01 00:51:55 -04:00
88c8d1a3c6 rename "minimal" preset to "basic" 2021-06-30 20:39:17 -04:00
e4bb7da69f small tweak 2021-06-30 20:25:21 -04:00
7ba9c22d2c update installation instructions and remove references to patches which we don't provide anymore 2021-06-30 14:54:58 -04:00
11328cbed2 update package variables and implement minimal/most selection of packages 2021-06-30 14:45:26 -04:00
1c25caaa6e convert explicit tables of packages to simpler to maintain table from list constructs 2021-06-30 14:40:20 -04:00
4928bd8b3d Merge branch 'master' of github.com:lammps/lammps into kk_finalize 2021-06-30 10:18:12 -06:00
cc0d9f2be0 recover building the manual 2021-06-29 21:49:21 -04:00
9d208c9ebd rename some examples folders 2021-06-29 20:25:18 -04:00