Diffusion lammps 1bfe3a3ff5ba

Merge branch 'merge-pull-100' into lammps-icms
1bfe3a3ff5ba
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 24 2016, 20:30.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 24 2016, 20:30

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS9a31a5469319: fix a few small issues on USER-HADRESS docs. still much more work to do.
rLAMMPS95ec7a3c0e70: fixup CR-LF mess

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1bfe3a3ff5ba: Merge branch 'merge-pull-100' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 24 2016, 20:30

Merged Changes

Commit	Author	Details	Committed
9a31a5469319	Axel Kohlmeyer	fix a few small issues on USER-HADRESS docs. still much more work to do.	Jun 24 2016
317dcdf1783b	Axel Kohlmeyer	Cleanup of USER-HADRESS documentation to match the current state. regenerate…	Jun 24 2016
6ba8906ce2fe	Axel Kohlmeyer	Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge…	Jun 24 2016
b69f79ca1b98	MaziarHeidari	HADRESS_Version_24_Jun_2016	Jun 24 2016
3424786a4779	MaziarHeidari	HADRESS_Version_24_Jun_2016	Jun 24 2016
1ed74de9a87f	MaziarHeidari	HADRESS_Version_24_Jun_2016	Jun 24 2016
7e4cd4643459	MaziarHeidari	HADRESS_Version_24_Jun_2016	Jun 24 2016
1f7f7bf12b45	MaziarHeidari	HADRESS_Version_24_Jun_2016	Jun 24 2016
2e4fdec2869b	MaziarHeidari	HADRESS_Version_24_Jun_2016	Jun 24 2016
824c0a359638	MaziarHeidari	HADRESS_Version_24_Jun_2016	Jun 24 2016
2f5827189b3c	Axel Kohlmeyer	Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge…	Jun 20 2016
d40eaf99429a	MaziarHeidari	HADRESS_NEW_REVISION	Jun 20 2016
4e62aa6510fc	Axel Kohlmeyer	Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge…	Jun 20 2016
10435ca8dcc7	MaziarHeidari	HADRESS_NEW_REVISION	Jun 20 2016
e707236bf733	MaziarHeidari	HADRESS_NEW_REVISION	Jun 20 2016

Changes (43)

		Path
A		doc/src/Eqs/HADRESS_AT_pair_coul_dsf.jpg
A		doc/src/Eqs/HADRESS_AT_pair_coul_dsf.tex
A		doc/src/Eqs/HADRESS_AT_pair_lj.jpg
A		doc/src/Eqs/HADRESS_AT_pair_lj.tex
A		doc/src/Eqs/HADRESS_CG_pair_lj.jpg
A		doc/src/Eqs/HADRESS_CG_pair_lj.tex
A		doc/src/Eqs/HADRESS_Switching_Function_Cylinder.jpg
A		doc/src/Eqs/HADRESS_Switching_Function_Cylinder.tex
A		doc/src/Eqs/HADRESS_Switching_Function_Slab.jpg
A		doc/src/Eqs/HADRESS_Switching_Function_Slab.tex
A		doc/src/Eqs/HADRESS_Switching_Function_Sphere.jpg
A		doc/src/Eqs/HADRESS_Switching_Function_Sphere.tex
A		doc/src/Eqs/HADRESS_System_Hamiltonian.jpg
A		doc/src/Eqs/HADRESS_System_Hamiltonian.tex
A		doc/src/Eqs/HADRESS_System_Potentials.jpg
A		doc/src/Eqs/HADRESS_System_Potentials.tex
A		doc/src/JPG/HADRESS_MODEL_LAMMPS.png
A		doc/src/fix_lambdah_calc.txt
A		doc/src/pair_lj_hars.txt
A	(dir)	examples/USER/hadress/
A	(dir)	examples/USER/hadress/H-AdResS/
A		examples/USER/hadress/H-AdResS/HADRESS_Water
A	(dir)	examples/USER/hadress/Relaxation/
A		examples/USER/hadress/Relaxation/LongSetup
A		examples/USER/hadress/Relaxation/molecule
M		src/Makefile
A	(dir)	src/USER-HADRESS/
A		src/USER-HADRESS/README
A		src/USER-HADRESS/atom_vec_full_hars.cpp
A		src/USER-HADRESS/atom_vec_full_hars.h
A		src/USER-HADRESS/fix_lambdah_calc.cpp
A		src/USER-HADRESS/fix_lambdah_calc.h
A		src/USER-HADRESS/pair_lj_cut_coul_dsf_hars_at.cpp
A		src/USER-HADRESS/pair_lj_cut_coul_dsf_hars_at.h
A		src/USER-HADRESS/pair_lj_cut_hars_at.cpp
A		src/USER-HADRESS/pair_lj_cut_hars_at.h
A		src/USER-HADRESS/pair_lj_cut_hars_cg.cpp
A		src/USER-HADRESS/pair_lj_cut_hars_cg.h
M		src/atom.cpp
M		src/atom.h
M		src/molecule.cpp
M		src/molecule.h
M		src/read_data.cpp