Commit Graph

17 Commits

Author SHA1 Message Date
176facc1fa change OpenCL default back to mixed precision 2014-11-03 15:51:01 -05:00
5f10cbd4df update OpenCL default settings for Intel OpenCL runtime 2014-10-30 18:33:59 -04:00
8a07871047 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/REPLICA/neb.h
	src/USER-REAXC/fix_qeq_reax.cpp
	src/read_data.h
2014-01-29 07:08:08 -05:00
64138f3433 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11363 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-29 00:08:18 +00:00
1e28f6b218 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11362 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-29 00:07:38 +00:00
39b1597778 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/RIGID/fix_shake.cpp
	src/variable.cpp
	src/write_data.cpp
2014-01-26 21:35:32 -05:00
28194a14eb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11335 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 23:53:12 +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
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
ce2b853e4a Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Eqs/pair_gauss.jpg
	doc/Manual.txt
	doc/pair_list.html
	doc/pair_list.txt
	lib/atc/Makefile.lammps.linalg
	lib/awpmd/Makefile.lammps.linalg
	lib/gpu/Makefile.lincoln
	lib/linalg/Makefile.gfortran
	lib/linalg/Makefile.mingw_cross
	lib/linalg/README
	lib/reax/Makefile.lammps
	src/USER-CG-CMM/Install.sh
	src/USER-COLVARS/Install.sh
	src/USER-CUDA/Install.sh
	src/USER-MISC/Install.sh
	src/USER-MISC/pair_list.cpp
	src/USER-OMP/Install.sh
	src/USER-PHONON/Install.sh
2013-06-01 13:53:34 +02:00
5c541cb43a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9978 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 20:04:31 +00:00
9259ae8699 Merge branch 'master' into lammps-icms
Resolved Conflicts:
	doc/Eqs/pair_coul_diel.jpg
	doc/Section_commands.html
	doc/Section_commands.txt
	doc/pair_coul_diel.html
	doc/pair_coul_diel.txt
	doc/processors.html
	doc/processors.txt
	examples/USER/imd/bucky_cnt_imd.vmd
	examples/USER/imd/in.bucky-plus-cnt
	examples/USER/imd/in.deca-ala-solv_imd
	examples/USER/imd/in.deca-ala_imd
	lib/gpu/Makefile.fermi
	lib/gpu/Makefile.lincoln
	lib/gpu/Makefile.longhorn
	lib/gpu/Makefile.serial
	lib/gpu/geryon/VERSION.txt
	lib/gpu/pair_gpu_device.cpp
	src/ASPHERE/atom_vec_ellipsoid.cpp
	src/CLASS2/Install.sh
	src/COLLOID/atom_vec_colloid.cpp
	src/DIPOLE/atom_vec_dipole.cpp
	src/GPU/fix_gpu.cpp
	src/GRANULAR/atom_vec_granular.cpp
	src/GRANULAR/fix_pour.h
	src/KSPACE/Install.sh
	src/KSPACE/fft3d.cpp
	src/KSPACE/fft3d.h
	src/KSPACE/kissfft.h
	src/KSPACE/pppm.cpp
	src/KSPACE/pppm.h
	src/KSPACE/pppm_tip4p.cpp
	src/MAKE/Makefile.openmpi
	src/MAKE/Makefile.serial
	src/MANYBODY/pair_airebo.cpp
	src/MANYBODY/pair_comb.cpp
	src/MANYBODY/pair_eam.cpp
	src/MANYBODY/pair_eim.cpp
	src/MANYBODY/pair_sw.cpp
	src/MANYBODY/pair_tersoff.cpp
	src/MANYBODY/pair_tersoff_zbl.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/Makefile
	src/Makefile.lib
	src/PERI/atom_vec_peri.cpp
	src/USER-CG-CMM/Install.sh
	src/USER-IMD/README
	src/USER-IMD/fix_imd.cpp
	src/USER-IMD/fix_imd.h
	src/USER-SMD/Install.sh
	src/atom_vec_atomic.cpp
	src/atom_vec_charge.cpp
	src/comm.cpp
	src/finish.cpp
	src/fix_box_relax.cpp
	src/fix_deposit.cpp
	src/fix_spring_self.cpp
	src/fix_store_state.cpp
	src/fix_wall.cpp
	src/fix_wall_reflect.cpp
	src/input.cpp
	src/input.h
	src/memory.cpp
	src/memory.h
	src/pair_lj_cut.cpp
	tools/restart2data.cpp
2011-12-31 19:07:46 -05:00
37f098062b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7275 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-02 15:51:43 +00:00
5f799182b3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6053 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-02 15:02:52 +00:00
c00c133529 recover option to write object files to ./obj
add rule to makefiles to create the directory
if it is not already present (e.g. after a
direct checkout).
2011-01-13 14:28:42 -05:00
8f2257ecbf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5537 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-12 15:24:04 +00:00
5a82c99485 Changes from Mike Brown.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5277 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-23 00:40:35 +00:00