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

Resolving merge conflicts

Browse Source
This commit is contained in:
Joel Thomas Clemmer
2022-03-23 14:28:27 -06:00
parent 9417e41676 3e7de83e6e
commit 92a968a8a9
1211 changed files with 219865 additions and 402506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/set.cpp
View File

@ -321,10 +321,7 @@ void Set::command(int narg, char **arg)
} else if (strcmp(arg[iarg],"theta") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal set command");
if (utils::strmatch(arg[iarg+1],"^v_")) varparse(arg[iarg+1],1);
else {
dvalue = utils::numeric(FLERR,arg[iarg+1],false,lmp);
dvalue *= MY_PI/180.0;
}
else dvalue = DEG2RAD * utils::numeric(FLERR,arg[iarg+1],false,lmp);
if (!atom->line_flag)
error->all(FLERR,"Cannot set this attribute for this atom style");
set(THETA);