Diffusion lammps b666d3083dd5

Merge branch 'lammps-icms' into lammps-molfile
b666d3083dd5
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 1 2012, 18:39.

Description

Merge branch 'lammps-icms' into lammps-molfile

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 1 2012, 18:39

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa9a06178fab9: Merge branch 'lammps-icms' into lammps-molfile
rLAMMPSa8e1db9c1931: avoid inefficient pow(x,2)

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb666d3083dd5: Merge branch 'lammps-icms' into lammps-molfile (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 1 2012, 18:39

Merged Changes

Commit	Author	Details	Committed
a8e1db9c1931	Axel Kohlmeyer	avoid inefficient pow(x,2)	Jun 1 2012
69880a0af584	Axel Kohlmeyer	adjust for change of MPI stub to plain C code.	Jun 1 2012
fd2cbd4957d5	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jun 1 2012
ac65e05a8852	Axel Kohlmeyer	avoid infinite loop when creating atoms at random locations in region outside…	Jun 1 2012
eac6bb8df6c0	Axel Kohlmeyer	makefile updates for serial cross compile	Jun 1 2012
2bd9c4379ce3	Axel Kohlmeyer	first batch of power function fixes	Jun 1 2012
63ec8368b0e2	Axel Kohlmeyer	fix typo	Jun 1 2012
d4c275d4cc41	Axel Kohlmeyer	update library makefiles for cross-compilation with new compile	Jun 1 2012
e2f8449535b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8198 f3b2605a-c512-4ea7…	May 31 2012

Changes (57)

				Path
	M			doc/Section_start.html
	M			doc/Section_start.txt
	P			lib/colvars/Makefile.mingw32-cross Copied from lib/colvars/Makefile.fermi
	M			lib/colvars/colvarcomp.h
	M			lib/colvars/colvarvalue.h
	V			lib/meam/{Makefile.mingw32-cross ← Makefile.mingw_cross}
	V			lib/meam/{Makefile.mingw_cross → Makefile.mingw32-cross}
	V			lib/poems/{Makefile.mingw32-cross ← Makefile.mingw_cross}
	V			lib/poems/{Makefile.mingw_cross → Makefile.mingw32-cross}
	M			lib/reax/Makefile.lammps
	V			lib/reax/{Makefile.mingw32-cross ← Makefile.mingw_cross}
	V			lib/reax/{Makefile.mingw_cross → Makefile.mingw32-cross}
	M			src/FLD/pair_brownian.cpp
	M			src/FLD/pair_brownian_poly.cpp
	M			src/FLD/pair_lubricate.cpp
	M			src/FLD/pair_lubricateU.cpp
	M			src/FLD/pair_lubricateU_poly.cpp
	M			src/FLD/pair_lubricate_poly.cpp
	M			src/KSPACE/pppm.cpp
	V			src/MAKE/{Makefile.mingw32-cross ← Makefile.mingw_mpich}
	V			src/MAKE/{Makefile.mingw32-cross-serial ← Makefile.mingw_cross}
	V			src/MAKE/{Makefile.mingw_cross → Makefile.mingw32-cross-serial}
	V			src/MAKE/{Makefile.mingw_mpich → Makefile.mingw32-cross}
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_lcbop.cpp
	M			src/MC/fix_gcmc.cpp
	M			src/MOLECULE/angle_cosine_periodic.cpp
	M			src/MOLECULE/improper_umbrella.cpp
	M			src/MOLECULE/pair_hbond_dreiding_lj.cpp
	M			src/MOLECULE/pair_hbond_dreiding_morse.cpp
	M			src/REAX/pair_reax.cpp
	P			src/STUBS/Makefile.mingw32-cross Copied from src/STUBS/Makefile
	M			src/USER-EFF/fix_nvt_sllod_eff.cpp
	M			src/USER-EFF/pair_eff_inline.h
	M			src/USER-EWALDN/ewald_n.cpp
	M			src/USER-MISC/fix_imd.cpp
	M			src/USER-MISC/improper_ring.cpp
	M			src/USER-MISC/pair_dipole_sf.cpp
	M			src/USER-OMP/angle_cosine_periodic_omp.cpp
	M			src/USER-OMP/improper_ring_omp.cpp
	M			src/USER-OMP/pair_beck_omp.cpp
	M			src/USER-OMP/pair_brownian_omp.cpp
	M			src/USER-OMP/pair_brownian_poly_omp.cpp
	M			src/USER-OMP/pair_dipole_sf_omp.cpp
	M			src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
	M			src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
	M			src/USER-OMP/pair_lubricate_omp.cpp
	M			src/USER-OMP/pair_lubricate_poly_omp.cpp
	M			src/USER-OMP/pppm_cg_omp.cpp
	M			src/USER-OMP/pppm_omp.cpp
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/USER-REAXC/reaxc_valence_angles.cpp
	M			src/create_atoms.cpp
	M			src/lmpwindows.h
	M			src/pair.cpp
	M			src/pair_beck.cpp