Diffusion lammps 650c1164d1b3

Merge branch 'lammps-icms' into lammps-colvars
650c1164d1b3
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 5 2012, 22:09.

Description

Merge branch 'lammps-icms' into lammps-colvars

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 5 2012, 22:09

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS8e8e887554ad: add support for lj/*/coul/pppm/omp styles
rLAMMPSb4674e6a2810: continue colavars port to lammps. non-functional

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS650c1164d1b3: Merge branch 'lammps-icms' into lammps-colvars (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 5 2012, 22:09

Merged Changes

	Commit			Author	Details	Committed
	8e8e887554ad			Axel Kohlmeyer	add support for lj/*/coul/pppm/omp styles	Mar 5 2012
	c05291dbbfa8			Axel Kohlmeyer	overhault of restart regression testing	Mar 5 2012

Changes (35)

				Path
	M			regtest/restart/common-1.inc
	M			regtest/restart/compare.sh
	M			regtest/restart/coul_cut.inc
	M			regtest/restart/coul_debye.inc
	M			regtest/restart/coul_diel.inc
	M			regtest/restart/coul_long.inc
	M			regtest/restart/gauss.inc
	M			regtest/restart/gauss_cut.inc
	A			regtest/restart/hybrid_overlay.inc
	M			regtest/restart/in.restart2data
	M			regtest/restart/lj_cut.inc
	A			regtest/restart/lj_cut_coul_long.inc
	M			regtest/restart/lj_sdk.inc
	P			regtest/restart/refoutput/hybrid_overlay.ref-nosfx-01 Copied from regtest/restart/refoutput/coul_cut.ref-nosfx-01
	P			regtest/restart/refoutput/hybrid_overlay.ref-nosfx-02 Copied from regtest/restart/refoutput/coul_cut.ref-nosfx-02
	P			regtest/restart/refoutput/hybrid_overlay.ref-omp-01 Copied from regtest/restart/refoutput/coul_cut.ref-nosfx-01
	P			regtest/restart/refoutput/hybrid_overlay.ref-omp-02 Copied from regtest/restart/refoutput/coul_cut.ref-nosfx-02
	P			regtest/restart/refoutput/hybrid_overlay.ref-opt-01 Copied from regtest/restart/refoutput/coul_cut.ref-nosfx-01
	P			regtest/restart/refoutput/hybrid_overlay.ref-opt-02 Copied from regtest/restart/refoutput/coul_cut.ref-nosfx-02
	P			regtest/restart/refoutput/lj_cut_coul_long.ref-nosfx-01 Copied from regtest/restart/refoutput/lj_cut.ref-nosfx-01
	P			regtest/restart/refoutput/lj_cut_coul_long.ref-nosfx-02 Copied from regtest/restart/refoutput/lj_cut.ref-nosfx-02
	P			regtest/restart/refoutput/lj_cut_coul_long.ref-omp-01 Copied from regtest/restart/refoutput/lj_cut.ref-nosfx-01
	P			regtest/restart/refoutput/lj_cut_coul_long.ref-omp-02 Copied from regtest/restart/refoutput/lj_cut.ref-nosfx-02
	P			regtest/restart/refoutput/lj_cut_coul_long.ref-opt-01 Copied from regtest/restart/refoutput/lj_cut.ref-nosfx-01
	P			regtest/restart/refoutput/lj_cut_coul_long.ref-opt-02 Copied from regtest/restart/refoutput/lj_cut.ref-nosfx-02
	M			regtest/restart/refoutput/lj_sdk.ref-nosfx-01
	M			regtest/restart/refoutput/lj_sdk.ref-nosfx-02
	M			regtest/restart/refoutput/lj_sdk.ref-omp-01
	M			regtest/restart/refoutput/lj_sdk.ref-omp-02
	M			regtest/restart/refoutput/lj_sdk.ref-opt-01
	M			regtest/restart/refoutput/lj_sdk.ref-opt-02
	M			regtest/restart/runtests.sh
	M			regtest/restart/tersoff.inc
	M			regtest/restart/tersoff_table.inc
	M			tools/restart2data.cpp