Merge branch 'lammps-awesome' into lammps-icms
de2c71bff4e8
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 3 2010, 21:26.

Description

Merge branch 'lammps-awesome' into lammps-icms

resolve conflicts resulting from not merging
with lammps-axel before pushing.
src/USER-OPENMP/Install.sh
src/USER-OPENMP/dihedral_helix_omp.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 3 2010, 21:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS7eddf8caca46: Merge branch 'lammps-icms' of github.com:Skiphex/lammps-awesome into lammps-icms
rLAMMPSe25481652952: update list of optional files to be ignored.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSde2c71bff4e8: Merge branch 'lammps-awesome' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 3 2010, 21:26

Merged Changes

Commit	Author	Details	Committed
7eddf8caca46	Peter Shannon	Merge branch 'lammps-icms' of github.com:Skiphex/lammps-awesome into lammps-icms	Jun 3 2010
1f4d7e20cf6b	Peter Shannon	files deleted to restucture test directory	Jun 3 2010
06c9c6aa5a07	Peter Shannon	minor fixes made to dihedral_harmonic_omp.cpp	Jun 3 2010
93d93ab985b9	Peter Shannon	updated Install.sh in USER-OPENMP	Jun 3 2010
d63181690cda	Peter Shannon	restructured tests directory	Jun 3 2010
1bc519ac1323	Ryan Houlihan	Dihedral multi harmonic with OMP implemented	Jun 3 2010
a61bcd84c9b0	Ryan Houlihan	Dihedral OPLS with OMP implemented	Jun 3 2010
5deacd952ff5	Ryan Houlihan	Changed nnfrom and nnto to nfrom nto	Jun 3 2010

Changes (88)

		Path
M		src/USER-OPENMP/dihedral_harmonic_omp.cpp
P		src/USER-OPENMP/dihedral_helix_omp.cpp Copied to multiple locations: src/USER-OPENMP/dihedral_multi_harmonic_omp.cpp src/USER-OPENMP/dihedral_opls_omp.cpp
P		src/USER-OPENMP/dihedral_multi_harmonic_omp.cpp Copied from src/USER-OPENMP/dihedral_helix_omp.cpp
P		src/USER-OPENMP/dihedral_multi_harmonic_omp.h Copied from src/USER-OPENMP/dihedral_harmonic_omp.h
P		src/USER-OPENMP/dihedral_opls_omp.cpp Copied from src/USER-OPENMP/dihedral_helix_omp.cpp
P		src/USER-OPENMP/dihedral_opls_omp.h Copied from src/USER-OPENMP/dihedral_helix_omp.h
A	(dir)	tests/dihedral/
P		tests/dihedral/data.rhodo-harmonic-omp Copied from bench/data.rhodo
P		tests/dihedral/in.rhodo-harmonic-omp Copied from examples/USER/openmp/in.rhodo-omp
A		tests/dihedral/log.lammps
V		tests/{ → pair}/in.melt-born-coul-long
V		tests/{ → pair}/in.melt-born-coul-long-omp
V		tests/{ → pair}/in.melt-buck
V		tests/{ → pair}/in.melt-buck-coul-cut
V		tests/{ → pair}/in.melt-buck-coul-cut-omp
V		tests/{ → pair}/in.melt-buck-coul-long
V		tests/{ → pair}/in.melt-buck-coul-long-omp
V		tests/{ → pair}/in.melt-buck-omp
V		tests/{ → pair}/in.melt-cg-cmm
V		tests/{ → pair}/in.melt-cg-cmm-omp
V		tests/{ → pair}/in.melt-cut-coul-cut
V		tests/{ → pair}/in.melt-cut-coul-cut-omp
V		tests/{ → pair}/in.melt-dpd
V		tests/{ → pair}/in.melt-dpd-omp
V		tests/{ → pair}/in.melt-dpd-tstat
V		tests/{ → pair}/in.melt-dpd-tstat-omp
V		tests/{ → pair}/in.melt-lj-charmm-coul-charmm
V		tests/{ → pair}/in.melt-lj-charmm-coul-charmm-implicit
V		tests/{ → pair}/in.melt-lj-charmm-coul-charmm-implicit-omp
V		tests/{ → pair}/in.melt-lj-charmm-coul-charmm-omp
V		tests/{ → pair}/in.melt-lj-charmm-coul-long
V		tests/{ → pair}/in.melt-lj-charmm-coul-long-omp
V		tests/{ → pair}/in.melt-lj-cut-coul-cut
V		tests/{ → pair}/in.melt-lj-cut-coul-cut-omp
V		tests/{ → pair}/in.melt-lj-cut-coul-debye
V		tests/{ → pair}/in.melt-lj-cut-coul-debye-omp
V		tests/{ → pair}/in.melt-lj-cut-coul-long
V		tests/{ → pair}/in.melt-lj-cut-coul-long-omp
V		tests/{ → pair}/in.melt-lj-expand
V		tests/{ → pair}/in.melt-lj-expand-omp
V		tests/{ → pair}/in.melt-lj-gromacs
V		tests/{ → pair}/in.melt-lj-gromacs-coul-gromacs
V		tests/{ → pair}/in.melt-lj-gromacs-coul-gromacs-omp
V		tests/{ → pair}/in.melt-lj-gromacs-omp
V		tests/{ → pair}/in.melt-lj96-cut
V		tests/{ → pair}/in.melt-lj96-cut-omp
V		tests/{ → pair}/in.melt-yukawa
V		tests/{ → pair}/in.melt-yukawa-omp
A	(dir)	tests/pair/
A		tests/pair/buck.dat
V		tests/{pair ← }/in.melt-born-coul-long
V		tests/{pair ← }/in.melt-born-coul-long-omp
V		tests/{pair ← }/in.melt-buck
V		tests/{pair ← }/in.melt-buck-coul-cut
V		tests/{pair ← }/in.melt-buck-coul-cut-omp
V		tests/{pair ← }/in.melt-buck-coul-long
V		tests/{pair ← }/in.melt-buck-coul-long-omp
V		tests/{pair ← }/in.melt-buck-omp
V		tests/{pair ← }/in.melt-cg-cmm
V		tests/{pair ← }/in.melt-cg-cmm-omp
V		tests/{pair ← }/in.melt-cut-coul-cut
V		tests/{pair ← }/in.melt-cut-coul-cut-omp
V		tests/{pair ← }/in.melt-dpd
V		tests/{pair ← }/in.melt-dpd-omp
V		tests/{pair ← }/in.melt-dpd-tstat
V		tests/{pair ← }/in.melt-dpd-tstat-omp
V		tests/{pair ← }/in.melt-lj-charmm-coul-charmm
V		tests/{pair ← }/in.melt-lj-charmm-coul-charmm-implicit
V		tests/{pair ← }/in.melt-lj-charmm-coul-charmm-implicit-omp
V		tests/{pair ← }/in.melt-lj-charmm-coul-charmm-omp
V		tests/{pair ← }/in.melt-lj-charmm-coul-long
V		tests/{pair ← }/in.melt-lj-charmm-coul-long-omp
V		tests/{pair ← }/in.melt-lj-cut-coul-cut
V		tests/{pair ← }/in.melt-lj-cut-coul-cut-omp
V		tests/{pair ← }/in.melt-lj-cut-coul-debye
V		tests/{pair ← }/in.melt-lj-cut-coul-debye-omp
V		tests/{pair ← }/in.melt-lj-cut-coul-long
V		tests/{pair ← }/in.melt-lj-cut-coul-long-omp
V		tests/{pair ← }/in.melt-lj-expand
V		tests/{pair ← }/in.melt-lj-expand-omp
V		tests/{pair ← }/in.melt-lj-gromacs
V		tests/{pair ← }/in.melt-lj-gromacs-coul-gromacs
V		tests/{pair ← }/in.melt-lj-gromacs-coul-gromacs-omp
V		tests/{pair ← }/in.melt-lj-gromacs-omp
V		tests/{pair ← }/in.melt-lj96-cut
V		tests/{pair ← }/in.melt-lj96-cut-omp
V		tests/{pair ← }/in.melt-yukawa
V		tests/{pair ← }/in.melt-yukawa-omp