lammps into merge…
6ba8906ce2fe
Actions

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

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 24 2016, 20:00

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
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

				Path
	D			doc/fix_lambdah_calc.html
	D			doc/pair_lj_hars.html
	M			examples/USER/hadress/H-AdResS/HADRESS_Water
	M			examples/USER/hadress/Relaxation/LongSetup
	M			src/Makefile
	D			src/USER-HADRESS/Install.sh
	D			src/USER-HADRESS/atom.cpp
	D			src/USER-HADRESS/atom.h
	M			src/USER-HADRESS/fix_lambdah_calc.cpp
	D			src/USER-HADRESS/molecule.cpp
	D			src/USER-HADRESS/molecule.h
	M			src/USER-HADRESS/pair_lj_cut_coul_dsf_hars_at.cpp
	M			src/USER-HADRESS/pair_lj_cut_hars_at.cpp
	M			src/USER-HADRESS/pair_lj_cut_hars_cg.cpp
	D			src/USER-HADRESS/read_data.cpp
	D			src/USER-HADRESS/read_data.h
	M			src/atom.cpp
	M			src/atom.h
	M			src/molecule.cpp
	M			src/molecule.h
	M			src/read_data.cpp