Commit Graph

766 Commits

Author SHA1 Message Date
b46ddebe3e Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-09-05 14:02:35 +02:00
2b9171177d ATC version 2.0, date: Sep1
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10708 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-09-01 08:07:51 +00:00
2c30d74d8d Merge remote branch 'lammps-ro/master' into lammps-icms 2013-08-29 16:14:12 +02:00
8d6d4e9289 ATC version 2.0, date: Aug28
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10695 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-28 22:16:54 +00:00
2da0db319c Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-08-24 12:35:11 +02:00
6bb11c07e3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10680 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-23 15:13:45 +00:00
205833eaad git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10669 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-23 14:46:25 +00:00
22751a2aae git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10668 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-23 14:46:18 +00:00
402d1a8605 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10667 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-23 14:41:20 +00:00
1ca6fb0f81 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	lib/atc/CbEam.h
	src/USER-ATC/Install.sh
2013-08-23 13:31:30 +02:00
dddbef699d ATC version 2.0, date: Aug22
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10658 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-23 00:14:36 +00:00
56e6271883 ATC version 2.0, date: Aug22
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10654 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-22 23:31:09 +00:00
f93700aa19 Correct and cleanup some AtC issues 2013-08-22 13:38:00 +02:00
6297a32d9b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Respolved Conflicts:
	doc/Manual.txt
	lib/atc/CbEam.h
	lib/atc/LammpsInterface.cpp
	lib/atc/LammpsInterface.h
2013-08-22 13:04:27 +02:00
d77ab2f96a ATC version 2.0, date: Aug21
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10638 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-21 23:06:07 +00:00
dfda591ee4 do not include path to MPI stub lib for real MPI compile 2013-08-13 01:00:24 +02:00
3aede794af pair style eam may not be installed (yet) 2013-08-13 00:59:47 +02:00
1cdb01dfe3 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	lib/atc/Makefile.mingw32-cross
	lib/atc/Makefile.mingw32-cross-mpi
	lib/atc/Makefile.mingw64-cross
	lib/atc/Makefile.mingw64-cross-mpi
	lib/atc/Makefile.serial
2013-08-10 14:58:38 +02:00
d56c9dfd27 Removal of superfluous files from lib-atc repository.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10565 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-08 21:21:15 +00:00
3c17e7c07c fix permissions 2013-08-08 22:17:27 +02:00
c52a54587a some tweaks to make the parallel makefile work more smoothly 2013-08-08 22:12:20 +02:00
08a91514de we must not version control binaries. 2013-08-08 19:54:44 +02:00
5fa5def2f9 make AtC compatible with windows cross compiles 2013-08-08 19:54:11 +02:00
b806ad5c43 add BLAS/LAPACK files required to support AtC 2.0 2013-08-08 19:47:19 +02:00
c99c117e6e ignore dependency files 2013-08-08 19:40:26 +02:00
6b0ec36c0d remove unwated files 2013-08-08 19:39:55 +02:00
4704ced070 Updating libatc Makefiles to use only current version *.h and *.cpp files.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10564 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-08 15:34:04 +00:00
c931a450c0 Merge remote-tracking branch 'lammps-ro/master' into atc-merge
Resolved Conflicts:
	doc/Manual.txt
	src/USER-ATC/Install.sh
	tools/msi2lmp/biosym_frc_files/README
2013-08-08 14:02:03 +02:00
7855ef6dda ATC version 2.0, date: Aug7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10561 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-07 21:34:54 +00:00
0e4d1e6b22 ATC version 2.0, date: Aug7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10557 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-07 21:29:01 +00:00
9adfd0cac1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10519 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-02 15:02:54 +00:00
a6ceede04a implement a more portable version of the the clock_gettime workaround 2013-08-01 10:47:30 +02:00
c7e5039857 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10425 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 16:37:03 +00:00
d65b922bb2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10415 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 15:48:32 +00:00
1a4bead190 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10414 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 15:43:29 +00:00
434c695e39 re-instate Makefile.lammps 2013-07-26 11:40:02 +02:00
e6f6722365 make USER-CUDA compile with current LAMMPS-ICMS 2013-07-26 11:02:01 +02:00
b0007d45b7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10199 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-29 21:27:42 +00:00
e954b14d99 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10198 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-29 21:23:34 +00:00
c7183e199a Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	lib/cuda/Makefile.lammps
	src/MOLECULE/dihedral_charmm.cpp
	src/pair.h
2013-06-29 13:25:29 +02:00
1cda7f63aa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10166 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 19:32:18 +00:00
bfbe995a9c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10165 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 19:30:58 +00:00
c3c4b74504 add final EOL character 2013-06-28 16:38:50 +02:00
1c337c837c permission cleanup 2013-06-28 13:15:10 +02:00
2b1e3a30bd Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	doc/fix_tune_kspace.txt
	doc/group2ndx.txt
	src/DIPOLE/atom_vec_dipole.cpp
	src/DIPOLE/pair_lj_long_dipole_long.cpp
	src/MOLECULE/atom_vec_angle.cpp
	src/MOLECULE/atom_vec_bond.cpp
	src/MOLECULE/atom_vec_full.cpp
	src/MOLECULE/atom_vec_molecular.cpp
	src/PERI/atom_vec_peri.cpp
	src/USER-AWPMD/atom_vec_wavepacket.cpp
	src/USER-COLVARS/README
	src/USER-EFF/atom_vec_electron.cpp
	src/USER-SPH/atom_vec_meso.cpp
	src/atom.h
	src/atom_vec_atomic.cpp
	src/atom_vec_body.cpp
	src/atom_vec_charge.cpp
	src/atom_vec_ellipsoid.cpp
	src/atom_vec_line.cpp
	src/atom_vec_sphere.cpp
	src/atom_vec_tri.cpp
	src/fix_restrain.cpp
	src/force.cpp
	tools/restart2data.cpp
2013-06-28 13:09:52 +02:00
7b2f24f051 yet another path fix for x-compile. 2013-06-28 11:12:11 +02:00
e801cc0f39 one more time 2013-06-28 10:44:45 +02:00
2020a3abbb two more paths need to be corrected 2013-06-28 10:27:28 +02:00
016dac9c11 update gpu tool makefile for changed paths 2013-06-28 10:21:23 +02:00
6c4e44ad0d correct path to MPICH mpi library 2013-06-28 06:53:55 +02:00