jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/lengxupa/lammps

This commit is contained in:
Tongtong Shen 2019-12-06 12:05:27 -05:00
parent 38e82cbbcc 877329c1e4
commit bf20d72fc3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MISC/fix_deposit.cpp
View File

@ -418,7 +418,7 @@ void FixDeposit::pre_exchange()
while (rng > molfrac[imol]) imol++; while (rng > molfrac[imol]) imol++;
natom = onemols[imol]->natoms; natom = onemols[imol]->natoms;
if (dimension == 3) { if (dimension == 3) {
if (rflag == 1) { if (orientflag == 1) {
r[0] = rx; r[0] = rx;
r[1] = ry; r[1] = ry;
r[2] = rz; r[2] = rz;
@ -665,7 +665,7 @@ void FixDeposit::options(int narg, char **arg)
xmid = ymid = zmid = 0.0; xmid = ymid = zmid = 0.0;
scaleflag = 1; scaleflag = 1;
targetflag = 0; targetflag = 0;
rflag = 0; orientflag = 0;
rx = 0.0; rx = 0.0;
ry = 0.0; ry = 0.0;
rz = 0.0; rz = 0.0;
@ -778,7 +778,7 @@ void FixDeposit::options(int narg, char **arg)
iarg += 3; iarg += 3;
} else if (strcmp(arg[iarg],"orientation") == 0) { } else if (strcmp(arg[iarg],"orientation") == 0) {
if (iarg+4 > narg) error->all(FLERR,"Illegal fix deposit command"); if (iarg+4 > narg) error->all(FLERR,"Illegal fix deposit command");
rflag = 1; orientflag = 1;
rx = force->numeric(FLERR,arg[iarg+1]); rx = force->numeric(FLERR,arg[iarg+1]);
ry = force->numeric(FLERR,arg[iarg+2]); ry = force->numeric(FLERR,arg[iarg+2]);
rz = force->numeric(FLERR,arg[iarg+3]); rz = force->numeric(FLERR,arg[iarg+3]);

2
src/MISC/fix_deposit.h
View File

@ -38,7 +38,7 @@ class FixDeposit : public Fix {
private: private:
int ninsert,ntype,nfreq,seed; int ninsert,ntype,nfreq,seed;
int iregion,globalflag,localflag,maxattempt,rateflag,scaleflag,targetflag; int iregion,globalflag,localflag,maxattempt,rateflag,scaleflag,targetflag;
int mode,rigidflag,shakeflag,idnext,distflag,rflag; int mode,rigidflag,shakeflag,idnext,distflag,orientflag;
double lo,hi,deltasq,nearsq,rate,sigma; double lo,hi,deltasq,nearsq,rate,sigma;
double vxlo,vxhi,vylo,vyhi,vzlo,vzhi,rx,ry,rz; double vxlo,vxhi,vylo,vyhi,vzlo,vzhi,rx,ry,rz;
double xlo,xhi,ylo,yhi,zlo,zhi,xmid,ymid,zmid; double xlo,xhi,ylo,yhi,zlo,zhi,xmid,ymid,zmid;