Commit Graph

729 Commits

Author SHA1 Message Date
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
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
8dc2a751a0 makefiles for building the GPU library 2013-06-28 02:31:13 +02:00
7e0fef793d updates for compiling LAMMPS on windows with OpenCL support 2013-06-28 01:50:42 +02:00
6dc2447695 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10119 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-27 22:48:40 +00:00
4da20dce99 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10118 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-27 22:48:27 +00:00
a5d55a6f76 documentation update for colvars 2013-06-27 20:26:10 +02:00
8b031ab609 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10099 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-27 14:21:12 +00:00
f5bec5011a port to current mingw package 2013-06-27 14:57:55 +02:00
eee639db2f start of setting up building the gpu library 2013-06-26 15:41:32 +02:00
50a03de73b remove outdated msm gpu library code 2013-06-26 11:40:00 +02:00
fb8e8d0646 try to handle dependency generation for AtC better 2013-06-25 14:13:11 +02:00
d45dd25ce6 add wrapper makefiles that allow to use non-MPI libraries and makefiles 2013-06-25 11:50:00 +02:00
98b8a2c4f7 add MPI support for AtC library 2013-06-25 11:25:50 +02:00
c9a59e36f9 handle adjustable storage sizes correctly 2013-06-25 07:35:01 +02:00
865b3d696b cross compilation support in AtC 2013-06-25 07:22:17 +02:00
2e5f2ba1e8 port AWPMD to cross compilation with mingw 2013-06-25 00:31:43 +02:00
0024e1afc3 import changes from colvars repo 2013-06-23 14:49:38 +02:00
6f48ddb24f provide meaningful log message when re-initializing masses 2013-06-19 00:51:12 +02:00
7d444dcb71 more changes to support late initialization of masses 2013-06-19 00:22:43 +02:00
5a7dd0e74e import colvar module changes that allow resetting masses 2013-06-18 23:13:31 +02:00
9eeccbfffb update for building lib/meam with mingw cross compilers 2013-06-14 20:59:52 +02:00
6018567134 tweak to colvarmodule output 2013-06-14 12:19:40 +02:00
8cd52ce9a9 update colvars library 2013-06-13 14:51:34 +02:00
0b32ec3147 remove comment within comment 2013-06-11 09:17:10 +02:00
0567f76d4c small updates/corrections from giacomo 2013-06-11 06:16:49 +02:00
e038893385 whitespace fixes in colvars library 2013-06-10 14:47:15 +02:00
df0dcfd99b avoid spurious error on clean target 2013-06-09 16:31:08 +02:00
73452096d6 fix compile error 2013-06-09 16:26:34 +02:00
e240e15c4d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/USER-MISC/dihedral_nharmonic.cpp
	src/USER-MISC/pair_lj_sf_dipole_sf.h
2013-06-09 14:35:36 +02:00
3e5c7ae60f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10053 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-08 21:43:17 +00:00
3d664382ae update version number 2013-06-07 14:43:39 +02:00
df08be2f01 update colvars library from github repo 2013-06-07 14:39:17 +02:00
916211df33 updated the README with github URLs 2013-06-07 14:33:47 +02:00
6354d994c2 ignore Makefile.lammps entries as they are generated 2013-06-07 14:25:45 +02:00
2a9ada3ce4 update makefiles to reflect changes in the build procedure 2013-06-07 14:25:01 +02:00
a87e2f8709 fix up build system 2013-06-05 14:14:59 +02:00
77ed62b93b update of colvars library 2013-06-05 14:12:27 +02:00
5da358bf54 add makefiles for building 32-bit executables on 64-bit x86 Linux 2013-06-01 18:34:50 +02:00