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

Properly processing >1 fix set force

Browse Source
This commit is contained in:
jtclemm
2025-05-05 12:45:35 -06:00
parent 7c30111fa0
commit dc07a1471e
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/RHEO/compute_rheo_interface.cpp
View File

@ -344,31 +344,22 @@ void ComputeRHEOInterface::store_forces()
// If forces are overwritten by a fix, there are no pressure forces
// so just normalize
auto fixlist = modify->get_fix_by_style("setforce");
if (fixlist.size() != 0) {
for (const auto &fix : fixlist) {
for (int i = 0; i < atom->nlocal; i++) {
if (rmass)
minv = 1.0 / rmass[i];
else
minv = 1.0 / mass[type[i]];
if (mask[i] & fix->groupbit)
for (int a = 0; a < 3; a++) fp_store[i][a] = f[i][a] * minv;
else
for (int a = 0; a < 3; a++) fp_store[i][a] = (f[i][a] - fp_store[i][a]) * minv;
}
}
} else {
if (rmass) {
for (int i = 0; i < atom->nlocal; i++) {
minv = 1.0 / rmass[i];
for (int a = 0; a < 3; a++) fp_store[i][a] = (f[i][a] - fp_store[i][a]) * minv;
}
} else {
for (int i = 0; i < atom->nlocal; i++) {
minv = 1.0 / mass[type[i]];
for (int a = 0; a < 3; a++) fp_store[i][a] = (f[i][a] - fp_store[i][a]) * minv;
}
}
int skip_from_setforce;
for (int i = 0; i < atom->nlocal; i++) {
if (rmass)
minv = 1.0 / rmass[i];
else
minv = 1.0 / mass[type[i]];
skip_from_setforce = 0;
for (const auto &fix : fixlist)
if (mask[i] & fix->groupbit)
skip_from_setforce = 1;
if (skip_from_setforce)
for (int a = 0; a < 3; a++) fp_store[i][a] = f[i][a] * minv;
else
for (int a = 0; a < 3; a++) fp_store[i][a] = (f[i][a] - fp_store[i][a]) * minv;
}
// Forward comm forces