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

simplify nested include file handling

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-06-23 17:53:52 -04:00
parent 6d54cf6a07
commit d10fdda676
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/input.cpp
View File

@ -77,7 +77,6 @@ Input::Input(LAMMPS *lmp, int argc, char **argv) : Pointers(lmp)
echo_screen = 0;
echo_log = 1;
eof_return = 0;
label_active = 0;
labelstr = NULL;
@ -206,18 +205,7 @@ void Input::file()
MPI_Bcast(&n,1,MPI_INT,0,world);
if (n == 0) {
if (label_active) error->all(FLERR,"Label wasn't found in input script");
if (eof_return) break;
if (me == 0) {
if (infile != stdin) {
fclose(infile);
infile = NULL;
}
nfile--;
}
MPI_Bcast(&nfile,1,MPI_INT,0,world);
if (nfile == 0) break;
if (me == 0) infile = infiles[nfile-1];
continue;
break;
}
if (n > maxline) reallocate(line,maxline,n);
@ -1053,9 +1041,8 @@ void Input::include()
error->one(FLERR,str);
}
infiles[nfile++] = infile;
eof_return = 1;
file();
eof_return = 0;
fclose(infile);
nfile--;
infile = infiles[nfile-1];
}

1
src/input.h
View File

@ -46,7 +46,6 @@ class Input : protected Pointers {
char *command; // ptr to current command
int echo_screen; // 0 = no, 1 = yes
int echo_log; // 0 = no, 1 = yes
int eof_return; // if 1: at EOF return from parsing in file()
private:
int me; // proc ID