Homec4science
Diffusion lammps dd0178320644

Merge branch 'qmmm-qe' of bitbucket.org:akohlmey/lammps-icms into qmmm-qe
dd0178320644
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 4 2013, 11:30.

Description

Merge branch 'qmmm-qe' of bitbucket.org:akohlmey/lammps-icms into qmmm-qe

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Oct 4 2013, 11:30
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPSae7b59abddd9: Merge branch 'lammps-icms' into qmmm-qe
rLAMMPSed344b89f195: Merge branch 'lammps-icms' into qmmm-qe
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSdd0178320644: Merge branch 'qmmm-qe' of bitbucket.org:akohlmey/lammps-icms into qmmm-qe (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 4 2013, 11:30

Merged Changes

CommitAuthorDetailsCommitted
ae7b59abddd9Axel Kohlmeyer
Merge branch 'lammps-icms' into qmmm-qe 
Oct 3 2013
c6a486f71ad1Axel Kohlmeyer
add test for nm/cut/coul/long 
Oct 3 2013
21442a6221c3Axel Kohlmeyer
complete implementation of nm/cut styles for USER-OMP 
Oct 3 2013
cb9424f53716Axel Kohlmeyer
add test for nm/cut/coul/cut 
Oct 3 2013
fee8a8b3a68eAxel Kohlmeyer
add more nm/cut pair styles for USER-OMP (still incomplete) 
Oct 3 2013
4c738bfa0e74Axel Kohlmeyer
add test example for nm/cut 
Oct 3 2013
5f2e89786f73Axel Kohlmeyer
fix compilation issue due to new timer class in lammps-icms 
Oct 3 2013

Changes (14)

Path
A(dir)bench-accel/bench_nm/
Pbench-accel/bench_nm/in.nm
Copied from bench-accel/bench_lj/in.lj
A(dir)bench-accel/bench_nm_coul/
Abench-accel/bench_nm_coul/in.nm_coul
A(dir)bench-accel/bench_nm_long/
Abench-accel/bench_nm_long/in.nm_long
Mdoc/pair_nm.txt
Psrc/USER-OMP/pair_nm_cut_coul_cut_omp.cpp
Copied from src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp
Psrc/USER-OMP/pair_nm_cut_coul_cut_omp.h
Copied from src/USER-OMP/pair_born_coul_wolf_omp.h
Psrc/USER-OMP/pair_nm_cut_coul_long_omp.cpp
Copied from src/USER-OMP/pair_lj_cut_coul_long_omp.cpp
Psrc/USER-OMP/pair_nm_cut_coul_long_omp.h
Copied from src/USER-OMP/pair_lj_cut_coul_long_omp.h
Psrc/USER-OMP/pair_nm_cut_omp.cpp
Copied from src/pair_nm_cut_omp.cpp
Psrc/USER-OMP/pair_nm_cut_omp.h
Copied from src/pair_nm_cut_omp.h
Msrc/thermo.cpp

rLAMMPSdd0178320644

View Options

bench-accel/bench_nm/in.nm

Loading...
View Options

bench-accel/bench_nm_coul/in.nm_coul

Loading...
View Options

bench-accel/bench_nm_long/in.nm_long

Loading...
View Options

doc/pair_nm.txt

Loading...
View Options

src/USER-OMP/pair_nm_cut_coul_cut_omp.cpp

Loading...
View Options

src/USER-OMP/pair_nm_cut_coul_cut_omp.h

Loading...
View Options

src/USER-OMP/pair_nm_cut_coul_long_omp.cpp

Loading...
View Options

src/USER-OMP/pair_nm_cut_coul_long_omp.h

Loading...
View Options

src/USER-OMP/pair_nm_cut_omp.cpp

Loading...
View Options

src/USER-OMP/pair_nm_cut_omp.h

Loading...
View Options

src/thermo.cpp

Loading...
c4science · Help