|
|
5680a3f9bb
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/comm.cpp
|
2013-05-24 15:24:12 +02:00 |
|
|
|
e3b479a4cd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9896 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-23 17:34:29 +00:00 |
|
|
|
21e4a32e65
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
doc/pair_coeff.txt
doc/pair_lj.txt
doc/pair_style.txt
src/respa.cpp
|
2013-03-08 12:26:50 +01:00 |
|
|
|
91b7613960
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9604 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-07 17:32:03 +00:00 |
|
|
|
7c01fd1e6a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9438 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-10 02:27:32 +00:00 |
|
|
|
52a2ba456a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9437 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-10 00:09:16 +00:00 |
|
|
|
1d68769ded
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/KSPACE/pair_buck_long_coul_long.cpp
src/USER-OMP/angle_fourier_omp.cpp
src/USER-OMP/angle_fourier_simple_omp.cpp
src/USER-OMP/angle_quartic_omp.cpp
src/USER-OMP/dihedral_fourier_omp.cpp
src/USER-OMP/dihedral_nharmonic_omp.cpp
src/USER-OMP/dihedral_quadratic_omp.cpp
src/USER-OMP/domain_omp.cpp
src/USER-OMP/fix_nh_asphere_omp.cpp
src/USER-OMP/fix_nh_omp.cpp
src/USER-OMP/fix_nh_sphere_omp.cpp
src/USER-OMP/fix_nve_omp.cpp
src/USER-OMP/fix_nvt_sllod_omp.cpp
src/USER-OMP/pair_dipole_sf_omp.cpp
src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
src/math_special.h
src/neigh_bond.cpp
src/neighbor.h
|
2013-02-09 13:21:53 +01:00 |
|
|
|
7a286596d8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9416 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-08 21:38:50 +00:00 |
|
|
|
427161ef56
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/MAKE/Makefile.openmpi
src/min_linesearch.cpp
|
2013-01-09 07:09:35 -05:00 |
|
|
|
da49b01f76
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9206 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-03 17:17:45 +00:00 |
|
|
|
e5cc471307
|
Merge branch 'master' into lammps-icms
|
2012-11-26 08:47:57 -05:00 |
|
|
|
6f7eabd60d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9086 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-11-21 16:11:34 +00:00 |
|
|
|
57e4f1615d
|
remove redundant line of code.
|
2012-07-04 12:22:33 -04:00 |
|
|
|
5f7cc52206
|
Merge branch 'master' into lammps-icms
|
2012-06-19 13:10:02 -04:00 |
|
|
|
bb48c5ccdc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8312 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-18 23:49:36 +00:00 |
|
|
|
a8af5ea42f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8306 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-18 23:03:41 +00:00 |
|
|
|
55b3a439e7
|
whitespace fixes
|
2012-06-14 10:46:04 -04:00 |
|
|
|
1f9f369657
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/rerun.cpp
src/run.cpp
|
2012-06-09 12:27:33 -04:00 |
|
|
|
7a2e00bbf1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8242 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-08 16:00:32 +00:00 |
|
|
|
48aa45f7f0
|
Merge branch 'master' into lammps-icms
Resolved Conflicts (i hope):
src/REPLICA/neb.cpp
src/REPLICA/prd.cpp
src/REPLICA/tad.cpp
src/REPLICA/verlet_split.cpp
src/USER-CUDA/atom_vec_angle_cuda.h
src/USER-CUDA/atom_vec_atomic_cuda.h
src/USER-CUDA/atom_vec_charge_cuda.h
src/USER-CUDA/atom_vec_full_cuda.h
src/USER-CUDA/compute_pe_cuda.h
src/USER-CUDA/compute_pressure_cuda.h
src/USER-CUDA/compute_temp_cuda.h
src/USER-CUDA/compute_temp_partial_cuda.h
src/USER-CUDA/cuda.cpp
src/USER-CUDA/cuda.h
src/USER-CUDA/cuda_data.h
src/USER-CUDA/cuda_neigh_list.h
src/USER-CUDA/fft3d_cuda.h
src/USER-CUDA/fft3d_wrap_cuda.h
src/USER-CUDA/fix_addforce_cuda.h
src/USER-CUDA/fix_aveforce_cuda.h
src/USER-CUDA/fix_enforce2d_cuda.h
src/USER-CUDA/fix_freeze_cuda.h
src/USER-CUDA/fix_gravity_cuda.h
src/USER-CUDA/fix_nve_cuda.h
src/USER-CUDA/fix_set_force_cuda.h
src/USER-CUDA/fix_temp_berendsen_cuda.h
src/USER-CUDA/fix_temp_rescale_cuda.h
src/USER-CUDA/fix_temp_rescale_limit_cuda.h
src/USER-CUDA/fix_viscous_cuda.h
src/USER-CUDA/pair_born_coul_long_cuda.h
src/USER-CUDA/pair_buck_coul_cut_cuda.h
src/USER-CUDA/pair_buck_coul_long_cuda.h
src/USER-CUDA/pair_buck_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_long_cuda.h
src/USER-CUDA/pair_cg_cmm_cuda.cpp
src/USER-CUDA/pair_cg_cmm_cuda.h
src/USER-CUDA/pair_eam_cuda.h
src/USER-CUDA/pair_gran_hooke_cuda.h
src/USER-CUDA/pair_lj96_cut_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_long_cuda.h
src/USER-CUDA/pair_lj_class2_coul_cut_cuda.h
src/USER-CUDA/pair_lj_class2_coul_long_cuda.h
src/USER-CUDA/pair_lj_class2_cuda.h
src/USER-CUDA/pair_lj_cut_coul_cut_cuda.h
src/USER-CUDA/pair_lj_cut_coul_debye_cuda.h
src/USER-CUDA/pair_lj_cut_coul_long_cuda.h
src/USER-CUDA/pair_lj_cut_cuda.h
src/USER-CUDA/pair_lj_cut_experimental_cuda.h
src/USER-CUDA/pair_lj_expand_cuda.h
src/USER-CUDA/pair_lj_gromacs_coul_gromacs_cuda.h
src/USER-CUDA/pair_lj_gromacs_cuda.h
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
src/USER-CUDA/pair_lj_sdk_cuda.h
src/USER-CUDA/pair_lj_smooth_cuda.h
src/USER-CUDA/pair_morse_cuda.h
src/USER-CUDA/pair_sw_cuda.h
src/USER-CUDA/pair_tersoff_cuda.h
src/USER-CUDA/pair_tersoff_zbl_cuda.h
src/USER-CUDA/pppm_cuda.h
src/USER-CUDA/verlet_cuda.cpp
src/USER-CUDA/verlet_cuda.h
src/comm.cpp
src/finish.cpp
src/fix_rigid_nvt.h
src/respa.cpp
src/run.cpp
|
2012-06-07 16:42:38 -04:00 |
|
|
|
a1209775b4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8228 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-06 23:56:25 +00:00 |
|
|
|
ef9e700545
|
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 |
|
|
|
978a0a8501
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/min.cpp
src/verlet.cpp
|
2012-04-13 08:56:42 -04:00 |
|
|
|
e4974ae9af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8016 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-04-12 22:32:17 +00:00 |
|
|
|
5d0e05d0b0
|
Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp-master
Resolved Conflicts:
src/verlet.cpp
|
2011-12-03 09:59:37 -05:00 |
|
|
|
ca4f233802
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
lib/gpu/Makefile.firefly
lib/gpu/Makefile.firefly_opencl
lib/gpu/Nvidia.makefile
lib/gpu/Opencl.makefile
lib/gpu/lal_cg_cmm.cpp
lib/gpu/lal_cg_cmm.cu
lib/gpu/lal_cg_cmm.h
lib/gpu/lal_cg_cmm_ext.cpp
lib/gpu/lal_cg_cmm_long.cpp
lib/gpu/lal_cg_cmm_long.cu
lib/gpu/lal_cg_cmm_long.h
lib/gpu/lal_cg_cmm_long_ext.cpp
lib/gpu/lal_precision.h
lib/gpu/lal_preprocessor.h
src/GPU/Install.sh
src/GPU/pair_lj_cut_coul_long_gpu.cpp
src/GPU/pair_lj_sdk_coul_long_gpu.cpp
src/GPU/pair_lj_sdk_gpu.cpp
|
2011-12-03 09:49:28 -05:00 |
|
|
|
66a6c37c99
|
fix bug in memory clearing
|
2011-12-03 00:14:03 -05:00 |
|
|
|
d8449c7101
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7296 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-02 22:58:34 +00:00 |
|
|
|
9d162cd555
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
doc/Section_commands.txt
doc/Section_packages.txt
doc/Section_start.txt
doc/angle_sdk.html
doc/package.txt
doc/pair_coul_diel.txt
doc/pair_gauss.txt
doc/pair_sdk.html
doc/suffix.txt
src/GPU/pppm_gpu.cpp
src/PERI/fix_peri_neigh.h
src/USER-CG-CMM/README
src/USER-OMP/fix_peri_neigh_omp.h
src/input.cpp
src/min.cpp
src/verlet.cpp
|
2011-12-02 11:52:06 -05:00 |
|
|
|
8c372f6c41
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7266 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-01 17:21:19 +00:00 |
|
|
|
3295bdbec0
|
Merge branch 'openmp-next-merge' into openmp-master
Resolved Conflicts:
doc/fix_wall_reflect.txt
src/GPU/fix_gpu.cpp
src/USER-CUDA/verlet_cuda.cpp
src/min.cpp
src/neigh_full.cpp
src/neigh_request.cpp
src/respa.cpp
|
2011-10-25 08:40:55 -04:00 |
|
|
|
9c5ad7cf33
|
Merge branch 'master' into openmp-next-merge
Resolved Conflicts:
doc/fix_wall_reflect.txt
src/GPU/fix_gpu.cpp
src/neigh_full.cpp
src/neigh_request.cpp
|
2011-10-25 08:37:53 -04:00 |
|
|
|
c6bbdcfbf2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7184 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-24 20:28:02 +00:00 |
|
|
|
aa5daaff35
|
single out assorted bugfixes and changes that should
be sent to steve before the next big OpenMP update.
|
2011-10-22 17:49:17 -04:00 |
|
|
|
747ea72461
|
force arrays and alike are cleared in parallel when the omp package command is active.
FixOMP does no longer need to be a friend.
|
2011-10-12 22:20:00 -04:00 |
|
|
|
78b0055319
|
Merge branch 'ak-fix' into openmp-step2
Resolved Conflicts:
src/COLLOID/pair_colloid.cpp
src/pair_table.cpp
|
2011-09-24 13:55:42 -04:00 |
|
|
|
19e8c92a90
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-09-23 18:06:55 +00:00 |
|
|
|
c5b95e57fc
|
more infrastructure prep work for OpenMP styles
|
2011-09-05 18:40:05 -04:00 |
|
|
|
e1e087eeec
|
Merge branch 'master' into openmp-step2
|
2011-08-28 07:14:06 -04:00 |
|
|
|
3179014485
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6835 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-27 20:01:42 +00:00 |
|
|
|
488eca7165
|
implemented improved timer class
|
2011-08-26 18:39:14 -04:00 |
|
|
|
d0efe70181
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6817 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-25 22:25:06 +00:00 |
|
|
|
147842df01
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6327 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-07 18:06:14 +00:00 |
|
|
|
d13fee36fa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5881 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-30 18:03:47 +00:00 |
|
|
|
82ec94916d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5520 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-11 00:41:00 +00:00 |
|
|
|
6ec332feea
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5105 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-22 21:27:16 +00:00 |
|
|
|
a5f54fa1e2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4589 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-25 17:03:55 +00:00 |
|
|
|
5450680d03
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4547 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-20 20:43:41 +00:00 |
|
|
|
92209c7adf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4515 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-19 16:36:55 +00:00 |
|
|
|
5bbed4347d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4375 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-07-15 23:23:37 +00:00 |
|
