git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12950 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2015-01-19 22:14:11 +00:00
parent 3eab216a55
commit 1eb5be1591
23 changed files with 124 additions and 163 deletions

View File

@ -175,8 +175,6 @@ FixAdapt::~FixAdapt()
}
delete [] adapt;
if (chgflag && force->kspace) force->kspace->qsum_update_flag = 0;
// check nfix in case all fixes have already been deleted
if (id_fix_diam && modify->nfix) modify->delete_fix(id_fix_diam);
@ -353,11 +351,6 @@ void FixAdapt::init()
}
}
// when adapting charge and using kspace,
// need to recompute additional params in kspace->setup()
if (chgflag && force->kspace) force->kspace->qsum_update_flag = 1;
// fixes that store initial per-atom values
if (id_fix_diam) {
@ -504,10 +497,9 @@ void FixAdapt::change_settings()
if (anypair) force->pair->reinit();
// re-setup KSpace if it exists and adapting charges
// since charges have changed
// reset KSpace charges if charges have changed
if (chgflag && force->kspace) force->kspace->setup();
if (chgflag && force->kspace) force->kspace->qsum_qsq();
}
/* ----------------------------------------------------------------------