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

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

Browse Source
This commit is contained in:
sjplimp
2016-02-26 15:55:30 +00:00
parent b6e19b7803
commit ea62766575
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fix_adapt.cpp
View File

@ -328,10 +328,13 @@ void FixAdapt::init()
if (ptr == NULL)
error->all(FLERR,"Fix adapt pair style param not supported");
// for pair styles only parameters that are 2-d arrays in atom types are supported
if (ad->pdim != 2)
// for pair styles only parameters that are 2-d arrays in atom types or
// scalars are supported
if (ad->pdim != 2 && ad->pdim != 0)
error->all(FLERR,"Fix adapt pair style param is not compatible");
else ad->array = (double **) ptr;
if(ad->pdim == 2) ad->array = (double **) ptr;
if(ad->pdim == 0) ad->scalar = (double *) ptr;
// if pair hybrid, test that ilo,ihi,jlo,jhi are valid for sub-style
@ -365,13 +368,14 @@ void FixAdapt::init()
}
// make copy of original pair array values
for (int m = 0; m < nadapt; m++) {
Adapt *ad = &adapt[m];
if (ad->which == PAIR && ad->pdim == 2) {
for (i = ad->ilo; i <= ad->ihi; i++)
for (j = MAX(ad->jlo,i); j <= ad->jhi; j++)
ad->array_orig[i][j] = ad->array[i][j];
}else if (ad->which == PAIR && ad->pdim == 0){
ad->scalar_orig = *ad->scalar;
}
}