ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,492 Commits 12 Branches 209 Tags
016a144c3c19df3cf0945ddc64a8d885e925bd4a
Commit Graph

218 Commits

Author SHA1 Message Date
Stefan Paquay
f513bf05ec removed some crap a file manager left behind. 2016-03-03 12:02:33 -05:00
Stefan Paquay
0d630f1675 Merge branch 'lammps-icms' of https://github.com/lammps/lammps into add-user-manifold 2016-03-03 11:36:16 -05:00
Stefan Paquay
889fda57fe Added user-manifold package. 2016-03-02 18:04:11 -05:00
Axel Kohlmeyer
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
sjplimp
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
sjplimp
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
sjplimp
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
Axel Kohlmeyer
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
sjplimp
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
Richard Berger
d8c3c99f54 Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk 2016-01-30 17:48:21 +01:00
Axel Kohlmeyer
6303826d29 Merge remote branch 'lammps-ro/master' into lammps-icms 2016-01-29 13:59:06 +01:00
sjplimp
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
sjplimp
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
Richard Berger
2f8eae4d35 Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk 2016-01-26 00:25:23 +01:00
Axel Kohlmeyer
2aaf9f3d59 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
 2016-01-23 06:32:13 -05:00
sjplimp
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
Axel Kohlmeyer
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
sjplimp
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
sjplimp
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
Richard Berger
b24ec4a985 Added first test case 2015-12-24 00:33:33 +01:00
Axel Kohlmeyer
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
sjplimp
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
sjplimp
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
Axel Kohlmeyer
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
sjplimp
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
Axel Kohlmeyer
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
sjplimp
336aa4093e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14181 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-10-23 00:06:46 +00:00
sjplimp
f8d13ac853 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14174 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-10-22 23:36:53 +00:00
Axel Kohlmeyer
823cc16bdf Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/Section_start.txt
#	doc/pair_hybrid.txt
#	doc/pair_reax.html
#	src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
#	src/KSPACE/pair_lj_cut_coul_long.cpp
#	src/KSPACE/pair_lj_cut_coul_msm.cpp
#	src/MC/fix_bond_break.cpp
#	src/MC/fix_bond_break.h
#	src/MC/fix_bond_create.cpp
#	src/MC/fix_bond_create.h
#	src/USER-FEP/pair_lj_cut_soft.cpp
#	src/USER-MISC/README
#	src/USER-MISC/fix_ti_spring.cpp
#	src/output.cpp
 2015-10-22 08:17:31 -04:00
sjplimp
ddfb996d8e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14127 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-10-21 18:16:47 +00:00
Axel Kohlmeyer
5e861837d8 update input for current code 2015-09-09 20:31:43 -04:00
sjplimp
c9188c0095 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13956 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-08-28 23:50:01 +00:00
Axel Kohlmeyer
3591af9f33 add compute tally test and usage reference examples 2015-08-25 17:37:26 -04:00
Axel Kohlmeyer
4bf254972b add old inpu examples for user-tally. need to rework for release 2015-08-20 20:39:53 -04:00
Axel Kohlmeyer
5107280519 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
 2015-08-06 00:51:11 -04:00
sjplimp
7e1de6da04 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13834 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-08-04 20:57:54 +00:00
Axel Kohlmeyer
6c8830b828 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
 2015-07-28 13:26:45 -04:00
sjplimp
9ed741e904 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13738 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-27 18:12:18 +00:00
sjplimp
3dfb446590 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13729 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-27 14:57:19 +00:00
Axel Kohlmeyer
7af18596a1 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	src/fix_ave_histo.cpp
 2015-07-23 06:26:52 -04:00
sjplimp
6864dfa2d1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13682 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-22 15:52:49 +00:00
sjplimp
63802b7688 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13674 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-22 15:26:43 +00:00
sjplimp
c3fd41010d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13464 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-05-15 16:33:17 +00:00
Axel Kohlmeyer
21db4bc68c update to USER-FEP docs and examples 2015-05-15 00:59:50 -04:00
Axel Kohlmeyer
09bb220083 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2015-02-25 17:03:53 -05:00
sjplimp
cb912c1954 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13150 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-02-24 16:28:56 +00:00
Axel Kohlmeyer
74ba3d3095 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-12-01 11:27:44 -05:00
sjplimp
6d4200ec45 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12800 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-26 16:05:29 +00:00
sjplimp
1bfeda4e3e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12799 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-11-26 16:04:35 +00:00
Axel Kohlmeyer
475aa20270 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_intro.txt
	doc/fix_gle.txt
	doc/fix_ipi.txt
	examples/USER/i-pi/README
	src/USER-MISC/README
	src/USER-MISC/fix_gle.cpp
	src/USER-MISC/fix_ipi.cpp
	src/USER-MISC/fix_ipi.h
 2014-11-25 15:01:31 -05:00