Commit Graph

1808 Commits

Author SHA1 Message Date
6de9c09730 Tweaked econs.py 2021-12-23 16:35:30 -07:00
19d469222a Added test for energy conservation 2021-12-23 16:28:25 -07:00
addb8948f9 Able to run dynamics smoothly, does not conserve energy, but maybe that is a feature 2021-12-23 15:01:41 -07:00
c69edde55c Eliminated several undefined variables 2021-12-10 18:30:44 -07:00
591af3f560 Eliminated obvious but hard to find error in neighbor list request 2021-10-29 07:49:15 -06:00
6d5506353b Eliminated a few mistakes,s till not working 2021-10-24 15:45:24 -06:00
f41d650294 Added non-working pair script 2021-10-03 17:59:33 -06:00
0a4e85a1f3 Added README.grid 2021-08-26 11:58:39 -06:00
ea3c89165a Resolved memory management issue exposed by RCB in in.grid.test 2021-08-26 11:52:06 -06:00
78f9c7b478 Declared victory on compute grid and grid/local 2021-08-25 17:52:53 -06:00
f473ca498b Created in.grid.local, fixed some problems in src 2021-08-22 19:24:23 -06:00
1b1f6f29c2 Updated grid.py to use sna/grid/local compute, but it seg-faults 2021-08-22 18:44:35 -06:00
94c97e83a2 Added this helper file 2021-08-22 18:30:02 -06:00
a0197644f0 Merge remote-tracking branch 'origin/master' into compute-grid-new 2021-07-30 10:04:09 -06:00
b9ab0eb607 fix broken symbolic links 2021-07-28 21:32:52 -04:00
f192102da9 move examples away from USER-MISC now that the package folder is gone 2021-07-24 20:53:23 -04:00
d2684a2370 Merge branch 'master' into package-reorganization2 2021-07-23 07:41:10 -04:00
c78d4eab36 update standard examples for new style names 2021-07-21 22:52:43 -04:00
f8f4af471f general rename of files, styles, and keywords from "reax/c", "reax", or "reaxc" to "reaxff" 2021-07-21 21:52:25 -04:00
d16f751413 Merge branch 'master' into package-reorganization2 2021-07-21 10:23:04 -04:00
cf3bf374fa Merge branch 'master' into refactor-reaxff-parser 2021-07-21 00:30:53 -04:00
6604508b55 Merge branch 'master' into collected-small-changes 2021-07-20 19:39:10 -04:00
96389213ab Merge pull request #2788 from jtclemm/track-contacts
Track properties of pair interactions
2021-07-20 19:38:21 -04:00
8a4820a033 add data/units comments to example quip potential files 2021-07-20 19:31:52 -04:00
63794aa698 Merge branch 'master' into track-contacts
# Conflicts:
#	doc/src/Packages_details.rst
#	src/DIELECTRIC/pair_coul_cut_dielectric.h
#	src/MISC/fix_pair_tracker.cpp
#	src/MISC/fix_pair_tracker.h
#	src/MISC/pair_tracker.cpp
#	src/MISC/pair_tracker.h
#	src/pair_tracker.h
2021-07-20 16:19:38 -04:00
52156ccb35 Merge branch 'master' into package-reorganization2 2021-07-19 11:07:42 -04:00
15b3b6445e Updated tests and documentation, added warning message 2021-07-19 11:22:06 +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
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
2cf00a382e Completed merge to current master 2021-07-14 13:47:55 -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
41a434ae1f fix compilation issues with new/old Intel compilers 2021-07-11 14:09:17 -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
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
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
39039d261f Test6 2021-07-02 15:37:49 -06:00
01475cb3a8 Test3 2021-07-02 15:35:59 -06:00
e102864c2d Test2 2021-07-02 15:13:40 -06:00
442585313c Test 2021-07-02 15:11:14 -06:00
cf6570d812 Tweaked comments in grid examples 2021-07-02 15:06:19 -06:00
021e8a404d Updated example data files 2021-07-02 12:20:26 -05: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