|
|
637eef51b9
|
reformat
|
2021-07-15 15:45:01 -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 |
|
|
|
d024dc0e09
|
whitespace fixes
|
2021-07-15 15:12:04 -04:00 |
|
|
|
a7619b8dae
|
Removed virtual keyword, defined internal variable
|
2021-07-15 17:32:19 +01: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 |
|
|
|
0f0059269d
|
Modified data_bonds_post() and calling structure
|
2021-07-15 13:36:40 +01:00 |
|
|
|
54cf985280
|
Add message so no unexpected behavior
|
2021-07-14 20:54:50 -06:00 |
|
|
|
1ce5e3bd00
|
Merge branch 'master' of github.com:lammps/lammps into kk_snap_host
|
2021-07-14 14:49:16 -06:00 |
|
|
|
6378d1d128
|
Moved SNAP files to ML-SNAP
|
2021-07-14 13:50:49 -06:00 |
|
|
|
2cf00a382e
|
Completed merge to current master
|
2021-07-14 13:47:55 -06:00 |
|
|
|
07db7a4095
|
Changed to different check_local()
|
2021-07-14 13:35:05 -06:00 |
|
|
|
e87fae5c92
|
remove unused variable
|
2021-07-14 14:38:29 -04:00 |
|
|
|
ece556b463
|
Merge branch 'master' into refactor-reaxff-parser
# Conflicts:
# src/OPENMP/reaxc_init_md_omp.cpp
# src/REAXFF/reaxc_allocate.cpp
# src/REAXFF/reaxc_control.cpp
# src/REAXFF/reaxc_defs.h
# src/REAXFF/reaxc_ffield.cpp
# src/REAXFF/reaxc_init_md.cpp
# src/REAXFF/reaxc_io_tools.cpp
# src/REAXFF/reaxc_list.cpp
# src/REAXFF/reaxc_traj.cpp
|
2021-07-14 14:34:25 -04:00 |
|
|
|
5af74edcc0
|
Merge pull request #2815 from stanmoore1/kk_hash
Add atom_map hash option for Kokkos package
|
2021-07-14 14:20:11 -04:00 |
|
|
|
2295745318
|
Revert to original SNAP code for Kokkos CPU
|
2021-07-14 11:21:12 -06:00 |
|
|
|
38b156a08a
|
Resolved bogus merge conflict and added change to last molecule deletion
|
2021-07-14 11:07:10 -06:00 |
|
|
|
3895ae194d
|
Make function static
|
2021-07-13 12:17:24 -06:00 |
|
|
|
871ef80f83
|
Merge branch 'master' of github.com:lammps/lammps into kk_noinit
|
2021-07-13 11:42:41 -06:00 |
|
|
|
ac07253ed6
|
Fix GPU issues
|
2021-07-13 10:29:37 -06:00 |
|
|
|
01d7afdaa4
|
Small refactor
|
2021-07-12 15:54:02 -06:00 |
|
|
|
e29577634d
|
fix whitespace
|
2021-07-12 16:23:45 -04:00 |
|
|
|
e0ba11fbf0
|
update LAMMPS homepage URL
|
2021-07-12 16:19:31 -04:00 |
|
|
|
b4d3dbe0af
|
Avoid unnecessary deep_copy when only a single memory space
|
2021-07-12 14:11:53 -06:00 |
|
|
|
f4239530bd
|
recover virial and nofdotr related changes by @athomps and @akohlmey
|
2021-07-12 15:58:27 -04:00 |
|
|
|
b752bda1b9
|
Fix GPU issues
|
2021-07-12 13:06: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 |
|
|
|
ad966e130b
|
Fix typos
|
2021-07-12 10:41:31 -06:00 |
|
|
|
0540ce547b
|
Merge branch 'master' into package-reorganization2
|
2021-07-12 11:45:27 -04:00 |
|
|
|
b361992292
|
Remove deprecated Kokkos code ViewAllocateWithoutInitializing
|
2021-07-12 08:53:07 -06:00 |
|
|
|
bc4f2b65ae
|
the INTEL package does not support pair_modify nofdotr
- no need to test for it
- add a check and report an error if the nofdotr setting is used
|
2021-07-12 05:19:41 -04:00 |
|
|
|
6134164ad3
|
pair style rann does not support per-atom stress or pair_modify nofdotr
|
2021-07-11 20:03:52 -04:00 |
|
|
|
d774cd5ddc
|
fix sign errors and pair_modify nofdotr behavior for pair style bop
|
2021-07-11 19:27:49 -04:00 |
|
|
|
7e3e786530
|
fix up pair style polymorphic for pair_modify nofdotr
|
2021-07-11 19:19:41 -04:00 |
|
|
|
90e0de8dca
|
update MEAM package to correctly handle pair_modify nofdotr
|
2021-07-11 16:32:46 -04:00 |
|
|
|
5e096a7f9f
|
correct ev_tally4() for pair_modify nofdotr
|
2021-07-11 16:04:17 -04:00 |
|
|
|
51d082ff2b
|
reformat comments
|
2021-07-11 14:57:00 -04:00 |
|
|
|
0dcca23cdb
|
whitespace
|
2021-07-11 09:22:38 -04:00 |
|
|
|
283da2649a
|
fixes for pair_modify nofdotr
|
2021-07-11 09:16:47 -04:00 |
|
|
|
50da38722a
|
make airebo compatible with pair_modify nofdotr
|
2021-07-11 08:47:30 -04:00 |
|
|
|
a4748b4c28
|
update several MANYBODY potentials for pair_modify nofdotr
|
2021-07-11 08:20:20 -04:00 |
|
|
|
9898941169
|
update tersoff docs about tersoff/intel requiring intel compilers
|
2021-07-11 08:00:01 -04:00 |
|
|
|
03c55c14bc
|
avoid unneeded computations/tallying, small cleanups
|
2021-07-11 01:10:19 -04:00 |
|
|
|
0e440f9a42
|
more general mapping of tersoff/intel to tersoff when non-Intel compiler is used
|
2021-07-11 00:56:14 -04:00 |
|
|
|
467410d934
|
recover compilation due to changes in utility functions. still needs fixing
|
2021-07-11 00:55:45 -04:00 |
|
|
|
f82096c46c
|
correct nofdotr handling for tersoff styles
|
2021-07-11 00:55:22 -04:00 |
|
|
|
eff03f1493
|
reformat and use std::numeric_limits<double>::min() instead of DBL_MIN (Posix-only)
|
2021-07-10 23:40:30 -04:00 |
|
|
|
2d9ea81b94
|
fix bug with virial tally in edip/omp
|
2021-07-10 23:18:27 -04:00 |
|
|
|
0e55c2c4f2
|
Merge branch 'master' into nofdotr-tests-and-updates
# Conflicts:
# unittest/cplusplus/test_lammps_class.cpp
|
2021-07-10 22:36:43 -04:00 |
|
