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

remove class member name clashes. Pointers contains infile so we rename other uses to inpfile

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-06-23 16:43:54 -04:00
parent f190647ab4
commit 171d74f2f2
11 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MISC/fix_orient_bcc.cpp
View File

@ -115,25 +115,25 @@ FixOrientBCC::FixOrientBCC(LAMMPS *lmp, int narg, char **arg) :
char *result;
int count;
FILE *infile = fopen(xifilename,"r");
if (infile == NULL) error->one(FLERR,"Fix orient/bcc file open failed");
FILE *inpfile = fopen(xifilename,"r");
if (inpfile == NULL) error->one(FLERR,"Fix orient/bcc file open failed");
for (int i = 0; i < 4; i++) {
result = fgets(line,IMGMAX,infile);
result = fgets(line,IMGMAX,inpfile);
if (!result) error->one(FLERR,"Fix orient/bcc file read failed");
count = sscanf(line,"%lg %lg %lg",&Rxi[i][0],&Rxi[i][1],&Rxi[i][2]);
if (count != 3) error->one(FLERR,"Fix orient/bcc file read failed");
}
fclose(infile);
fclose(inpfile);
infile = fopen(chifilename,"r");
if (infile == NULL) error->one(FLERR,"Fix orient/bcc file open failed");
inpfile = fopen(chifilename,"r");
if (inpfile == NULL) error->one(FLERR,"Fix orient/bcc file open failed");
for (int i = 0; i < 4; i++) {
result = fgets(line,IMGMAX,infile);
result = fgets(line,IMGMAX,inpfile);
if (!result) error->one(FLERR,"Fix orient/bcc file read failed");
count = sscanf(line,"%lg %lg %lg",&Rchi[i][0],&Rchi[i][1],&Rchi[i][2]);
if (count != 3) error->one(FLERR,"Fix orient/bcc file read failed");
}
fclose(infile);
fclose(inpfile);
}
MPI_Bcast(&Rxi[0][0],18,MPI_DOUBLE,0,world);