Diffusion lammps 978d5786ce4c

Merge branch 'merge-pull-35' into lammps-icms
978d5786ce4c
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 8 2016, 16:53.

Description

Merge branch 'merge-pull-35' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 8 2016, 16:53

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS581aec69a74f: Merge branch 'lammps-icms' into merge-pull-35
rLAMMPS2762a07efdb4: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS978d5786ce4c: Merge branch 'merge-pull-35' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 8 2016, 16:53

Merged Changes

Commit	Author	Details	Committed
581aec69a74f	Axel Kohlmeyer	Merge branch 'lammps-icms' into merge-pull-35	Mar 5 2016
8574d6ae5117	Axel Kohlmeyer	no Install.sh file needed for a regular package with no dependencies	Mar 3 2016
8bce407ab5e2	Axel Kohlmeyer	whitespace cleanup	Mar 3 2016
c144dd976586	Axel Kohlmeyer	dead code removal and include file/header cleanup	Mar 3 2016
e37503367814	Axel Kohlmeyer	Merge branch 'add-user-manifold' of https://github.com/Pakketeretet2/lammps…	Mar 3 2016
f0e316fa243c	Stefan Paquay	Forgot to add manifold_factory.cpp	Mar 3 2016
745a8cfad3ab	Axel Kohlmeyer	Merge branch 'add-user-manifold' of https://github.com/Pakketeretet2/lammps…	Mar 3 2016
030f98e98a2a	Stefan Paquay	Changed some things.	Mar 3 2016
518a5fe7c128	Axel Kohlmeyer	Merge branch 'add-user-manifold' of https://github.com/Pakketeretet2/lammps…	Mar 3 2016
f513bf05ec71	Stefan Paquay	removed some crap a file manager left behind.	Mar 3 2016
f0b20ceda136	Stefan Paquay	Removed dzugatov-related files from wrong branch.	Mar 3 2016
69cf7b96ff72	Stefan Paquay	Merge branch 'add-user-manifold' of github.com:Pakketeretet2/lammps into add…	Mar 3 2016
0d630f16753f	Stefan Paquay	Merge branch 'lammps-icms' of https://github.com/lammps/lammps into add-user…	Mar 3 2016
66373d4d4e83	Stefan Paquay	started working on pair_dzugatov files	Mar 3 2016
739825134d1d	Stefan Paquay	removed some unnecessary files before merge.	Mar 3 2016
889fda57feea	Stefan Paquay	Added user-manifold package.	Mar 3 2016

Changes (74)

		Path
A		doc/fix_manifoldforce.txt
A		doc/fix_nve_manifold_rattle.txt
A		doc/fix_nvt_manifold_rattle.txt
A		doc/user_manifolds.txt
A	(dir)	examples/USER/manifold/
A	(dir)	examples/USER/manifold/diffusion/
A		examples/USER/manifold/diffusion/README
A		examples/USER/manifold/diffusion/msd.cyl.data
A		examples/USER/manifold/diffusion/msd.cyl.in
A		examples/USER/manifold/diffusion/msd.pdf
A		examples/USER/manifold/diffusion/msd.plane.data
A		examples/USER/manifold/diffusion/msd.plane.in
A		examples/USER/manifold/diffusion/msd.sphere.data
A		examples/USER/manifold/diffusion/msd.sphere.in
A		examples/USER/manifold/diffusion/msd_plot2.pdf
A		examples/USER/manifold/diffusion/plot_msd.gpl
A	(dir)	examples/USER/manifold/energy/
A		examples/USER/manifold/energy/README
A		examples/USER/manifold/energy/cylinder.data
A		examples/USER/manifold/energy/cylinder.setup
A		examples/USER/manifold/energy/energy.in
A		examples/USER/manifold/energy/energy.plane.in
A		examples/USER/manifold/energy/energy.sh
A		examples/USER/manifold/energy/energy_conservation.pdf
A		examples/USER/manifold/energy/energy_conservation.png
A		examples/USER/manifold/energy/plane.anneal.data
A		examples/USER/manifold/energy/plane.data
A		examples/USER/manifold/energy/plot_energies.gpl
A		examples/USER/manifold/energy/sphere.data
A		examples/USER/manifold/energy/sphere.setup
A		examples/USER/manifold/energy/torus.data
A		examples/USER/manifold/energy/torus.setup
A	(dir)	examples/USER/manifold/thylakoid/
A		examples/USER/manifold/thylakoid/README
A		examples/USER/manifold/thylakoid/thylakoid.data
A		examples/USER/manifold/thylakoid/thylakoid.in
A	(dir)	examples/USER/manifold/virus/
A		examples/USER/manifold/virus/README
A		examples/USER/manifold/virus/init.data
A		examples/USER/manifold/virus/virus.in
M		src/Makefile
A	(dir)	src/USER-MANIFOLD/
A		src/USER-MANIFOLD/README
A		src/USER-MANIFOLD/fix_manifoldforce.cpp
A		src/USER-MANIFOLD/fix_manifoldforce.h
A		src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp
A		src/USER-MANIFOLD/fix_nve_manifold_rattle.h
A		src/USER-MANIFOLD/fix_nvt_manifold_rattle.cpp
A		src/USER-MANIFOLD/fix_nvt_manifold_rattle.h
A		src/USER-MANIFOLD/manifold.h
A		src/USER-MANIFOLD/manifold_cylinder.cpp
A		src/USER-MANIFOLD/manifold_cylinder.h
A		src/USER-MANIFOLD/manifold_cylinder_dent.cpp
A		src/USER-MANIFOLD/manifold_cylinder_dent.h
A		src/USER-MANIFOLD/manifold_dumbbell.cpp
A		src/USER-MANIFOLD/manifold_dumbbell.h
A		src/USER-MANIFOLD/manifold_ellipsoid.cpp
A		src/USER-MANIFOLD/manifold_ellipsoid.h
A		src/USER-MANIFOLD/manifold_factory.cpp
A		src/USER-MANIFOLD/manifold_factory.h
A		src/USER-MANIFOLD/manifold_plane.cpp
A		src/USER-MANIFOLD/manifold_plane.h
A		src/USER-MANIFOLD/manifold_plane_wiggle.cpp
A		src/USER-MANIFOLD/manifold_plane_wiggle.h
A		src/USER-MANIFOLD/manifold_sphere.h
A		src/USER-MANIFOLD/manifold_spine.cpp
A		src/USER-MANIFOLD/manifold_spine.h
A		src/USER-MANIFOLD/manifold_supersphere.h
A		src/USER-MANIFOLD/manifold_thylakoid.cpp
A		src/USER-MANIFOLD/manifold_thylakoid.h
A		src/USER-MANIFOLD/manifold_thylakoid_shared.cpp
A		src/USER-MANIFOLD/manifold_thylakoid_shared.h
A		src/USER-MANIFOLD/manifold_torus.cpp
A		src/USER-MANIFOLD/manifold_torus.h