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

Merge branch 'collected-small-changes' of github.com:akohlmey/lammps into collected-small-changes

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-06-07 17:37:13 -04:00
parent 31a734b03d a2edef7c9c
commit afd4f5b0a6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/USER-MISC/pair_cdeam.cpp
View File

@ -456,11 +456,11 @@ void PairCDEAM::read_h_coeff(char *filename)
{
if(comm->me == 0) {
// Open potential file
FILE *fp;
FILE *fptr;
char line[MAXLINE];
char nextline[MAXLINE];
fp = force->open_potential(filename);
if (fp == NULL) {
fptr = force->open_potential(filename);
if (fptr == NULL) {
char str[128];
sprintf(str,"Cannot open EAM potential file %s", filename);
error->one(FLERR,str);
@ -468,7 +468,7 @@ void PairCDEAM::read_h_coeff(char *filename)
// h coefficients are stored at the end of the file.
// Skip to last line of file.
while(fgets(nextline, MAXLINE, fp) != NULL) {
while(fgets(nextline, MAXLINE, fptr) != NULL) {
strcpy(line, nextline);
}
char* ptr = strtok(line, " \t\n\r\f");
@ -483,7 +483,7 @@ void PairCDEAM::read_h_coeff(char *filename)
error->one(FLERR,"Failed to read h(x) function coefficients from EAM file.");
// Close the potential file.
fclose(fp);
fclose(fptr);
}
MPI_Bcast(&nhcoeff, 1, MPI_INT, 0, world);