tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-03-16 00:50:10 -04:00
parent 68b6296f90
commit 3d67d1eee9
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/variable.cpp
View File

@ -186,9 +186,7 @@ void Variable::set(int narg, char **arg)
nlast = utils::inumeric(FLERR,arg[2],false,lmp);
if (nlast <= 0) error->all(FLERR,"Illegal variable command");
if (narg == 4 && strcmp(arg[3],"pad") == 0) {
char digits[12];
sprintf(digits,"%d",nlast);
pad[nvar] = strlen(digits);
pad[nvar] = fmt::format("{}",nlast).size();
} else pad[nvar] = 0;
} else if (narg == 4 || (narg == 5 && strcmp(arg[4],"pad") == 0)) {
nfirst = utils::inumeric(FLERR,arg[2],false,lmp);
@ -196,9 +194,7 @@ void Variable::set(int narg, char **arg)
if (nfirst > nlast || nlast < 0)
error->all(FLERR,"Illegal variable command");
if (narg == 5 && strcmp(arg[4],"pad") == 0) {
char digits[12];
sprintf(digits,"%d",nlast);
pad[nvar] = strlen(digits);
pad[nvar] = fmt::format("{}",nlast).size();
} else pad[nvar] = 0;
} else error->all(FLERR,"Illegal variable command");
num[nvar] = nlast;

8
src/write_coeff.cpp
View File

@ -43,11 +43,7 @@ void WriteCoeff::command(int narg, char **arg)
if (narg != 1) error->all(FLERR,"Illegal write_coeff command");
int n = strlen(arg[0]) + 5;
char *file = new char[n];
strcpy(file,"tmp.");
strcat(file,arg[0]);
char *file = utils::strdup(fmt::format("tmp.{}",arg[0]));
// initialize relevant styles
lmp->init();
@ -114,7 +110,7 @@ void WriteCoeff::command(int narg, char **arg)
const char *section = (const char *)"";
fputs(str,two); // style
utils::sfgets(FLERR,str,256,one,file,error); // coeff
n = strlen(str);
int n = strlen(str);
strcpy(coeff,str);
coeff[n-1] = '\0';
utils::sfgets(FLERR,str,256,one,file,error);