Commit Graph

242 Commits

Author SHA1 Message Date
36bc96ea61 revised fix_flow_gauss 2016-08-23 09:54:46 -06:00
5a5a10c75f revised fix_flow_gauss 2016-08-23 09:46:08 -06:00
433741564d add run 0 to USER-TALLY examples to enforce shake constraints on step 0 2016-08-10 20:25:44 -04:00
e3eb617652 update several old input files to current syntax 2016-07-31 18:32:48 -04:00
d90f91f047 update USER-HARDRESS example inputs to work with a current LAMMPS version and produce reference outputs. 2016-06-29 15:52:01 -04:00
e1d589bc8d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-06-29 07:16:27 -04:00
cec2f2518f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15225 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-28 13:23:54 +00:00
1bfe3a3ff5 Merge branch 'merge-pull-100' into lammps-icms 2016-06-24 14:30:41 -04:00
6ba8906ce2 Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge-pull-100 2016-06-24 14:00:24 -04:00
824c0a3596 HADRESS_Version_24_Jun_2016 2016-06-24 15:49:52 +02:00
1647a54020 Fix missing newlines in a few USER-DPD example input files. 2016-06-23 10:43:19 -04:00
297f31387f Restore use of "atom_style atomic" in two of the USER-DPD examples. 2016-06-23 10:28:29 -04:00
2f5827189b Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge-pull-100 2016-06-20 13:04:18 -04:00
d40eaf9942 HADRESS_NEW_REVISION 2016-06-20 18:11:52 +02:00
a23a2407a7 USER-DPD now requires atom_style dpd due to a recent change.
Includes updates to the documentation and dpd-shardlow
and dpdp-shardlow input files in examples/USER/dpd/*
2016-06-16 16:13:31 -04:00
35777976fb fix permissions of USER-DPD input examples 2016-06-10 05:54:43 -04:00
4c611fb1d0 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-06-08 06:29:08 -04:00
f3d5260813 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15145 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 18:00:54 +00:00
9c5655db7c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15130 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 15:51:43 +00:00
6c80e2cc59 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-05-13 06:15:59 -04:00
87e06310cb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15051 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-12 16:29:09 +00:00
62b95b6b34 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15050 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-12 16:28:22 +00:00
9efcf1359e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-05-12 06:13:49 -04:00
b0eea89503 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15034 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-11 20:38:08 +00:00
f513bf05ec removed some crap a file manager left behind. 2016-03-03 12:02:33 -05:00
0d630f1675 Merge branch 'lammps-icms' of https://github.com/lammps/lammps into add-user-manifold 2016-03-03 11:36:16 -05:00
889fda57fe Added user-manifold package. 2016-03-02 18:04:11 -05:00
1d9d6f9241 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Eqs/improper_dist-1.jpg
	doc/Eqs/pair_mdf-1.jpg
	doc/Eqs/pair_mdf-2.jpg
	doc/Eqs/pair_mdf-3.jpg
	doc/Eqs/pair_mdf-4.jpg
	doc/Eqs/pair_mdf-5.jpg
	doc/Eqs/pair_mdf-6.jpg
	doc/Manual.html
	doc/Manual.txt
	doc/Section_commands.txt
	doc/dump_custom_vtk.txt
	doc/fix.txt
	lib/vtk/Makefile.lammps
	python/lammps.py
	src/Makefile
	src/USER-COLVARS/ndx_group.cpp
	src/USER-VTK/dump_custom_vtk.h
2016-02-16 12:44:25 +01:00
7512821dd6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14628 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 21:20:17 +00:00
507bde5b5a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14627 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 21:19:55 +00:00
ed9e162025 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14626 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 21:18:29 +00:00
15822b0927 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
2016-02-04 14:11:07 +01:00
c1aebdd391 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14544 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:39:32 +00:00
d8c3c99f54 Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk 2016-01-30 17:48:21 +01:00
6303826d29 Merge remote branch 'lammps-ro/master' into lammps-icms 2016-01-29 13:59:06 +01:00
7e67afad7b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14511 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-28 21:19:43 +00:00
d42ebe4e5e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14510 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-28 21:17:32 +00:00
2f8eae4d35 Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk 2016-01-26 00:25:23 +01:00
2aaf9f3d59 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
2016-01-23 06:32:13 -05:00
67d5513df1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14483 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-23 00:59:04 +00:00
607c4aa2a3 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	src/USER-SMTBQ/pair_smtbq.cpp
2016-01-12 07:02:29 -05:00
eb063200bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14411 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 17:59:15 +00:00
e86cfe431a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14410 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 17:58:37 +00:00
b24ec4a985 Added first test case 2015-12-24 00:33:33 +01:00
1aeecfb0cf Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/pair_reax.html
#	src/USER-PHONON/fix_phonon.cpp
2015-12-16 07:31:09 -05:00
31f22919ab git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14369 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 16:03:53 +00:00
9f38620e13 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14368 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 16:01:54 +00:00
5affb6c013 Merge branch 'master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/pair_hybrid.txt
#	doc/pair_reax.html
#	doc/pair_reax.txt
#	doc/pair_reax_c.txt
#	src/MANYBODY/pair_polymorphic.cpp
2015-12-11 07:33:14 -05:00
2cf6305dc1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14351 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 17:40:52 +00:00
07554c8efe Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	lib/colvars/colvarmodule.h
#	src/Makefile
#	src/min_cg.cpp
#	src/min_fire.cpp
#	src/min_quickmin.cpp
#	src/min_sd.cpp
#	src/respa.cpp
#	src/version.h
2015-10-23 07:08:37 -04:00