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

Merge branch 'master' into fix-dummy

Browse Source 
sync with latest whitespace changes
This commit is contained in:
Steve Plimpton
2019-11-06 13:49:59 -07:00
parent 6af726e589 bb18adc745
commit f2795f26b8
1638 changed files with 3025 additions and 2236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fix_neigh_history.cpp
View File

@ -421,7 +421,7 @@ void FixNeighHistory::pre_exchange_newton()
m = npartner[j]++;
partner[j][m] = tag[i];
jvalues = &valuepartner[j][dnum*m];
if (pair->nondefault_history_transfer)
if (pair->nondefault_history_transfer)
pair->transfer_history(onevalues,jvalues);
else for (n = 0; n < dnum; n++) jvalues[n] = -onevalues[n];
}
@ -535,7 +535,7 @@ void FixNeighHistory::pre_exchange_no_newton()
m = npartner[j]++;
partner[j][m] = tag[i];
jvalues = &valuepartner[j][dnum*m];
if (pair->nondefault_history_transfer)
if (pair->nondefault_history_transfer)
pair->transfer_history(onevalues, jvalues);
else for (n = 0; n < dnum; n++) jvalues[n] = -onevalues[n];
}