ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f13a26257db2c267cfd6df9c533aa55ce68650dc
lammps/src/ASPHERE
History
Axel Kohlmeyer fb7ecfd4a8 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	src/USER-CG-CMM/angle_cg_cmm.h
	src/USER-CG-CMM/cg_cmm_parms.h
	src/USER-CG-CMM/pair_cg_cmm.h
	src/USER-CG-CMM/pair_cg_cmm_coul_cut.h
	tools/restart2data.cpp
2013-11-23 12:49:37 +01:00
..
compute_erotate_asphere.cpp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9271 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-01-14 15:59:49 +00:00
compute_erotate_asphere.h
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
compute_temp_asphere.cpp
Merge remote branch 'lammps-ro/master' into lammps-icms
2013-02-13 13:56:03 +01:00
compute_temp_asphere.h
Merge remote branch 'lammps-ro/master' into lammps-icms
2013-02-13 13:56:03 +01:00
fix_nh_asphere.cpp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10894 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-10-30 15:15:25 +00:00
fix_nh_asphere.h
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
fix_nph_asphere.cpp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-06-06 22:47:51 +00:00
fix_nph_asphere.h
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
fix_npt_asphere.cpp
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
fix_npt_asphere.h
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
fix_nve_asphere_noforce.cpp
remove unused variables
2013-07-13 20:35:51 +02:00
fix_nve_asphere_noforce.h
fix up permissions
2013-03-05 09:53:36 +01:00
fix_nve_asphere.cpp
Merge branch 'master' into lammps-icms
2013-01-16 03:09:08 -05:00
fix_nve_asphere.h
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
fix_nve_line.cpp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9271 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-01-14 15:59:49 +00:00
fix_nve_line.h
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
fix_nve_tri.cpp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9271 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-01-14 15:59:49 +00:00
fix_nve_tri.h
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
fix_nvt_asphere.cpp
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
fix_nvt_asphere.h
Merge branch 'master' into lammps-icms
2012-06-07 16:42:38 -04:00
pair_gayberne.cpp
Merge remote branch 'lammps-ro/master' into lammps-icms
2013-11-23 12:49:37 +01:00
pair_gayberne.h
Merge remote branch 'lammps-ro/master' into lammps-icms
2013-11-23 12:49:37 +01:00
pair_line_lj.cpp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10103 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-06-27 20:02:55 +00:00
pair_line_lj.h
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
2013-02-16 12:25:40 +01:00
pair_resquared.cpp
remove references to old-style citeme calls
2013-07-27 11:56:14 +02:00
pair_resquared.h
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
2013-02-16 12:25:40 +01:00
pair_tri_lj.cpp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10103 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-06-27 20:02:55 +00:00
pair_tri_lj.h
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
2013-02-16 12:25:40 +01:00