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

Merge branch 'clean-master2' of github.com:julient31/lammps into pppm_spin

Browse Source 
Conflicts:
	src/SPIN/pair_spin_exchange.cpp
	src/atom.cpp
	src/pair.cpp
This commit is contained in:
julient31
2019-04-19 15:02:25 -06:00
parent 7a2d326103 898860328b
commit a696b26301
4475 changed files with 423708 additions and 327416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SPIN/atom_vec_spin.cpp
View File

@ -949,7 +949,7 @@ bigint AtomVecSpin::memory_usage()
return bytes;
}
void AtomVecSpin::force_clear(int n, size_t nbytes)
void AtomVecSpin::force_clear(int /*n*/, size_t nbytes)
{
memset(&atom->f[0][0],0,3*nbytes);
memset(&atom->fm[0][0],0,3*nbytes);