ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,687 Commits 12 Branches 209 Tags
1ee7cb100d97c902aaa621f19f4b3b59a6d96b66
Commit Graph

407 Commits

Author SHA1 Message Date
Axel Kohlmeyer
1ee7cb100d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/atom_vec_hybrid.cpp
	src/verlet.cpp
 2014-06-07 19:29:51 -04:00
sjplimp
52a1ef7a14 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12105 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-07 00:02:00 +00:00
sjplimp
b2fa4e6c90 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12080 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-04 23:04:18 +00:00
Axel Kohlmeyer
895ca766ee Merge remote branch 'lammps-ro/master' into lammps-kokkos 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/package.txt
 2014-06-02 10:45:39 +02:00
sjplimp
2e521b2a67 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12050 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-29 23:07:41 +00:00
Axel Kohlmeyer
950f06cff4 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-05-28 08:18:20 -04:00
sjplimp
21141894f7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12035 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-27 19:22:07 +00:00
Axel Kohlmeyer
a30a91c46e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-05-24 15:36:20 -04:00
sjplimp
e5e877dd3f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12025 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-23 22:53:15 +00:00
Axel Kohlmeyer
122cdf2c39 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_errors.txt
	doc/Section_start.txt
	src/USER-FEP/Install.sh
	src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp

Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>
 2014-05-23 06:37:33 -04:00
sjplimp
e9652224bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12019 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-22 14:43:36 +00:00
Axel Kohlmeyer
f9f7283fa5 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/accelerator_cuda.h
 2014-05-14 07:18:26 -04:00
sjplimp
c948a2bcb7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11987 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-13 17:16:10 +00:00
Axel Kohlmeyer
24fb679e55 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
CResolved onflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_commands.txt
	doc/Section_packages.txt
	doc/compute_fep.html
	doc/compute_fep.txt
	doc/fix_adapt_fep.html
	doc/fix_adapt_fep.txt
	doc/pair_lj_soft.html
	doc/pair_lj_soft.txt
	src/USER-FEP/Install.sh
	src/USER-FEP/README
	src/USER-FEP/compute_fep.cpp
	src/USER-OMP/pair_coul_cut_soft_omp.cpp
	src/USER-OMP/pair_coul_long_soft_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_cut_soft_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_long_soft_omp.cpp
	src/USER-OMP/pair_lj_cut_soft_omp.cpp
	src/USER-OMP/pair_lj_cut_tip4p_long_soft_omp.cpp
	src/USER-OMP/pair_tip4p_long_soft_omp.cpp
 2014-05-10 17:15:55 -04:00
sjplimp
196f3c2841 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11966 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:45:13 +00:00
Axel Kohlmeyer
f449ea4eaa Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-05-09 07:22:56 -04:00
sjplimp
90f055351f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11948 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-08 23:15:30 +00:00
Axel Kohlmeyer
4acacd8e3b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MISC/fix_efield.cpp
	src/fix_addforce.cpp
	src/fix_move.cpp
	src/fix_setforce.cpp
 2014-05-08 08:49:17 -04:00
sjplimp
919d293a14 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11941 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-07 16:33:38 +00:00
Axel Kohlmeyer
fc62bdc5cb Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-05-07 06:50:32 -04:00
sjplimp
71699d5d89 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11933 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-06 23:00:54 +00:00
sjplimp
1a29057daf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11930 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-06 22:49:52 +00:00
sjplimp
ed0c839eff git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11923 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-06 21:16:38 +00:00
Axel Kohlmeyer
4fbf7105d6 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MAKE/Makefile.ubuntu
	src/USER-REAXC/pair_reax_c.cpp
	src/USER-REAXC/reaxc_allocate.cpp
	src/USER-REAXC/reaxc_init_md.cpp
	src/USER-REAXC/reaxc_list.cpp
	src/USER-REAXC/reaxc_multi_body.cpp
	src/USER-REAXC/reaxc_reset_tools.cpp
	src/USER-REAXC/reaxc_tool_box.cpp
	src/USER-REAXC/reaxc_traj.cpp
	src/USER-REAXC/reaxc_types.h
	src/USER-REAXC/reaxc_vector.cpp
	src/write_data.cpp
 2014-05-03 08:13:28 -04:00
sjplimp
3a046a66ad git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11910 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 22:26:08 +00:00
sjplimp
95ee355671 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11895 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 17:33:18 +00:00
sjplimp
7ce22765cf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11884 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 15:06:34 +00:00
Axel Kohlmeyer
3a24287f4d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MC/fix_gcmc.cpp
	src/USER-REAXC/reaxc_types.h
 2014-05-01 08:24:38 -04:00
sjplimp
ddc1ad9ca2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11858 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-30 20:59:17 +00:00
Axel Kohlmeyer
104376fcba Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	lib/gpu/lal_sw.cu
	src/GRANULAR/fix_pour.cpp
 2014-04-30 06:43:53 -04:00
sjplimp
2cf0a3bafa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11845 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-29 23:26:34 +00:00
Axel Kohlmeyer
517a48da9a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MAKE/Makefile.bgq
	src/MAKE/Makefile.bgq.details
	src/MC/fix_gcmc.cpp
 2014-04-19 07:04:43 -04:00
sjplimp
bbc57688d8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11833 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-18 21:01:25 +00:00
Axel Kohlmeyer
e93e800f81 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-04-18 06:32:53 -04:00
sjplimp
182f71d113 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11812 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-17 17:05:32 +00:00
Axel Kohlmeyer
e51c613dfa Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-04-17 06:30:54 -04:00
sjplimp
9d1798e604 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11804 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-16 23:29:47 +00:00
Axel Kohlmeyer
c6992e8503 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-04-12 16:13:47 +02:00
sjplimp
5a26ea8238 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11784 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-11 23:37:41 +00:00
Axel Kohlmeyer
00a141d5ce Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-04-11 12:22:52 +02:00
sjplimp
e579757de1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11771 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-10 23:08:32 +00:00
Axel Kohlmeyer
5bb50f8841 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/USER-OMP/fix_qeq_comb_omp.cpp
 2014-04-10 13:24:56 +02:00
sjplimp
5e3ff6cffd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11754 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-09 15:59:29 +00:00
Axel Kohlmeyer
f8daecd639 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	examples/USER/openmp/parm.pegc12e8
	examples/USER/openmp/parm.pegc12e8-omp
 2014-04-09 13:49:45 +02:00
sjplimp
8355dc9ac0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11741 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-08 17:35:53 +00:00
Axel Kohlmeyer
20bb47e06a Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/fix_qmmm.txt
	doc/fix_recenter.txt
	lib/README
	lib/qmmm/README
	src/Makefile
	src/USER-QMMM/README
 2014-04-05 12:58:39 +02:00
sjplimp
0016a5b042 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11719 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-04 20:43:59 +00:00
sjplimp
a03cb3cf63 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11706 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-04 17:21:02 +00:00
Axel Kohlmeyer
84ee1efa3e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/atom_map.cpp
 2014-04-04 06:18:57 -04:00
sjplimp
df57381665 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11694 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-04-03 15:55:25 +00:00