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@8714 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2012-08-27 14:59:59 +00:00
parent feb096873e
commit d974674bc5
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/USER-OMP/pair_gran_hertz_history_omp.cpp
View File

@ -16,7 +16,7 @@
#include "pair_gran_hertz_history_omp.h"
#include "atom.h"
#include "comm.h"
#include "fix_rigid.h"
#include "fix.h"
#include "force.h"
#include "neighbor.h"
#include "neigh_list.h"
@ -52,7 +52,9 @@ void PairGranHertzHistoryOMP::compute(int eflag, int vflag)
// update body ptr and values for ghost atoms if using FixRigid masses
if (fix_rigid && neighbor->ago == 0) {
body = fix_rigid->body;
int tmp;
body = (int *) fix_rigid->extract("body",tmp);
mass_rigid = (double *) fix_rigid->extract("masstotal",tmp);
comm->forward_comm_pair(this);
}
@ -191,8 +193,8 @@ void PairGranHertzHistoryOMP::eval(int iifrom, int iito, ThrData * const thr)
mj = mass[type[j]];
}
if (fix_rigid) {
if (body[i] >= 0) mi = fix_rigid->masstotal[body[i]];
if (body[j] >= 0) mj = fix_rigid->masstotal[body[j]];
if (body[i] >= 0) mi = mass_rigid[body[i]];
if (body[j] >= 0) mj = mass_rigid[body[j]];
}
meff = mi*mj / (mi+mj);

10
src/USER-OMP/pair_gran_hooke_history_omp.cpp
View File

@ -16,7 +16,7 @@
#include "pair_gran_hooke_history_omp.h"
#include "atom.h"
#include "comm.h"
#include "fix_rigid.h"
#include "fix.h"
#include "force.h"
#include "neighbor.h"
#include "neigh_list.h"
@ -53,7 +53,9 @@ void PairGranHookeHistoryOMP::compute(int eflag, int vflag)
// update body ptr and values for ghost atoms if using FixRigid masses
if (fix_rigid && neighbor->ago == 0) {
body = fix_rigid->body;
int tmp;
body = (int *) fix_rigid->extract("body",tmp);
mass_rigid = (double *) fix_rigid->extract("masstotal",tmp);
comm->forward_comm_pair(this);
}
@ -196,8 +198,8 @@ void PairGranHookeHistoryOMP::eval(int iifrom, int iito, ThrData * const thr)
mj = mass[type[j]];
}
if (fix_rigid) {
if (body[i] >= 0) mi = fix_rigid->masstotal[body[i]];
if (body[j] >= 0) mj = fix_rigid->masstotal[body[j]];
if (body[i] >= 0) mi = mass_rigid[body[i]];
if (body[j] >= 0) mj = mass_rigid[body[j]];
}
meff = mi*mj / (mi+mj);

10
src/USER-OMP/pair_gran_hooke_omp.cpp
View File

@ -16,7 +16,7 @@
#include "pair_gran_hooke_omp.h"
#include "atom.h"
#include "comm.h"
#include "fix_rigid.h"
#include "fix.h"
#include "force.h"
#include "neighbor.h"
#include "neigh_list.h"
@ -48,7 +48,9 @@ void PairGranHookeOMP::compute(int eflag, int vflag)
// update body ptr and values for ghost atoms if using FixRigid masses
if (fix_rigid && neighbor->ago == 0) {
body = fix_rigid->body;
int tmp;
body = (int *) fix_rigid->extract("body",tmp);
mass_rigid = (double *) fix_rigid->extract("masstotal",tmp);
comm->forward_comm_pair(this);
}
@ -170,8 +172,8 @@ void PairGranHookeOMP::eval(int iifrom, int iito, ThrData * const thr)
mj = mass[type[j]];
}
if (fix_rigid) {
if (body[i] >= 0) mi = fix_rigid->masstotal[body[i]];
if (body[j] >= 0) mj = fix_rigid->masstotal[body[j]];
if (body[i] >= 0) mi = mass_rigid[body[i]];
if (body[j] >= 0) mj = mass_rigid[body[j]];
}
meff = mi*mj / (mi+mj);