ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'lammps-ro/master' into lammps-icms

Browse Source 
Resolved Conflicts:
	doc/Manual.txt
	doc/fix_tune_kspace.txt
	doc/group2ndx.txt
	src/DIPOLE/atom_vec_dipole.cpp
	src/DIPOLE/pair_lj_long_dipole_long.cpp
	src/MOLECULE/atom_vec_angle.cpp
	src/MOLECULE/atom_vec_bond.cpp
	src/MOLECULE/atom_vec_full.cpp
	src/MOLECULE/atom_vec_molecular.cpp
	src/PERI/atom_vec_peri.cpp
	src/USER-AWPMD/atom_vec_wavepacket.cpp
	src/USER-COLVARS/README
	src/USER-EFF/atom_vec_electron.cpp
	src/USER-SPH/atom_vec_meso.cpp
	src/atom.h
	src/atom_vec_atomic.cpp
	src/atom_vec_body.cpp
	src/atom_vec_charge.cpp
	src/atom_vec_ellipsoid.cpp
	src/atom_vec_line.cpp
	src/atom_vec_sphere.cpp
	src/atom_vec_tri.cpp
	src/fix_restrain.cpp
	src/force.cpp
	tools/restart2data.cpp
This commit is contained in:
Axel Kohlmeyer
2013-06-28 13:09:52 +02:00
parent f99231874b a92e8c271b
commit 2b1e3a30bd
70 changed files with 2219 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/kspace.cpp
View File

@ -37,6 +37,7 @@ KSpace::KSpace(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
ewaldflag = pppmflag = msmflag = dispersionflag = tip4pflag = dipoleflag = 0;
compute_flag = 1;
group_group_enable = 0;
stagger_flag = 0;
order = 5;
gridflag = 0;