Diffusion lammps 4e62aa6510fc

lammps into merge…
4e62aa6510fc
Actions

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

Description

Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge-pull-100

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 20 2016, 18:05

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS10435ca8dcc7: HADRESS_NEW_REVISION
rLAMMPS8309f007191f: Merge branch 'timer-timeout-thermo' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4e62aa6510fc: Merge branch 'USER-HADRESS' of https://github.com/hadress/lammps into merge… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 20 2016, 18:05

Merged Changes

	Commit			Author	Details	Committed
	10435ca8dcc7			MaziarHeidari	HADRESS_NEW_REVISION	Jun 20 2016
	e707236bf733			MaziarHeidari	HADRESS_NEW_REVISION	Jun 20 2016

Changes (47)

		Path
A	(dir)	doc/Eqs/
A		doc/Eqs/HADRESS_AT_pair_coul_dsf.jpg
A		doc/Eqs/HADRESS_AT_pair_coul_dsf.tex
A		doc/Eqs/HADRESS_AT_pair_lj.png
A		doc/Eqs/HADRESS_AT_pair_lj.tex
A		doc/Eqs/HADRESS_CG_pair_lj.png
A		doc/Eqs/HADRESS_CG_pair_lj.tex
A		doc/Eqs/HADRESS_Switching_Function_Cylinder.tex
A		doc/Eqs/HADRESS_Switching_Function_Slab.png
A		doc/Eqs/HADRESS_Switching_Function_Slab.tex
A		doc/Eqs/HADRESS_Switching_Function_Sphere.png
A		doc/Eqs/HADRESS_Switching_Function_Sphere.tex
A		doc/Eqs/HADRESS_System_Hamiltonian.png
A		doc/Eqs/HADRESS_System_Hamiltonian.tex
A		doc/Eqs/HADRESS_System_Potentials.png
A		doc/Eqs/HADRESS_System_Potentials.tex
A	(dir)	doc/JPG/
A		doc/JPG/HADRESS_MODEL_LAMMPS.png
A		doc/fix_lambdah_calc.html
A		doc/fix_lambdah_calc.txt
A		doc/pair_lj_hars.html
A		doc/pair_lj_hars.txt
A	(dir)	examples/H-AdResS/
A	(dir)	examples/H-AdResS/H-AdResS/
A		examples/H-AdResS/H-AdResS/HADRESS_Water
A	(dir)	examples/H-AdResS/Relaxation/
A		examples/H-AdResS/Relaxation/LongSetup
A		examples/H-AdResS/Relaxation/molecule
A	(dir)	src/USER-HADRESS/
A		src/USER-HADRESS/Install.sh
A		src/USER-HADRESS/README
A		src/USER-HADRESS/atom.cpp
A		src/USER-HADRESS/atom.h
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/molecule.cpp
A		src/USER-HADRESS/molecule.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
A		src/USER-HADRESS/read_data.cpp
P		src/USER-HADRESS/read_data.h Copied from src/read_data.h