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

Browse Source
This commit is contained in:
sjplimp
2014-09-05 14:39:17 +00:00
parent 68d424d3fc
commit f6c0d4fec3
5 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/fix_addforce.cpp
View File

@ -15,6 +15,7 @@
#include "stdlib.h"
#include "fix_addforce.h"
#include "atom.h"
#include "atom_masks.h"
#include "update.h"
#include "modify.h"
#include "domain.h"
@ -75,13 +76,19 @@ FixAddForce::FixAddForce(LAMMPS *lmp, int narg, char **arg) :
// optional args
nevery = 1;
iregion = -1;
idregion = NULL;
estr = NULL;
int iarg = 6;
while (iarg < narg) {
if (strcmp(arg[iarg],"region") == 0) {
if (strcmp(arg[iarg],"every") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal fix addforce command");
nevery = atoi(arg[iarg+1]);
if (nevery <= 0) error->all(FLERR,"Illegal fix addforce command");
iarg += 2;
} else if (strcmp(arg[iarg],"region") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal fix addforce command");
iregion = domain->find_region(arg[iarg+1]);
if (iregion == -1)
@ -124,6 +131,8 @@ FixAddForce::~FixAddForce()
int FixAddForce::setmask()
{
datamask_read = datamask_modify = 0;
int mask = 0;
mask |= POST_FORCE;
mask |= THERMO_ENERGY;
@ -225,6 +234,11 @@ void FixAddForce::post_force(int vflag)
imageint *image = atom->image;
int nlocal = atom->nlocal;
if (update->ntimestep % nevery) return;
atom->sync_modify((unsigned int) (F_MASK | MASK_MASK),
(unsigned int) F_MASK);
// update region if necessary
Region *region = NULL;