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

provide last input command line with error->one() output

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-11-06 10:41:01 -05:00
parent aa0d6cd75b
commit 5a8c5eb479
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/error.cpp
View File

@ -115,10 +115,10 @@ void Error::all(const char *file, int line, const char *str)
if (me == 0) { if (me == 0) {
if (input && input->line) lastcmd = input->line; if (input && input->line) lastcmd = input->line;
if (screen) fprintf(screen,"ERROR: %s (%s:%d)\n" if (screen) fprintf(screen,"ERROR: %s (%s:%d)\n"
"Last command: %s\n", "Last command: %s\n",
str,file,line,lastcmd); str,file,line,lastcmd);
if (logfile) fprintf(logfile,"ERROR: %s (%s:%d)\n" if (logfile) fprintf(logfile,"ERROR: %s (%s:%d)\n"
"Last command: %s\n", "Last command: %s\n",
str,file,line,lastcmd); str,file,line,lastcmd);
} }
@ -152,9 +152,17 @@ void Error::all(const char *file, int line, const char *str)
void Error::one(const char *file, int line, const char *str) void Error::one(const char *file, int line, const char *str)
{ {
int me; int me;
const char *lastcmd = (const char*)"(unknown)";
MPI_Comm_rank(world,&me); MPI_Comm_rank(world,&me);
if (screen) fprintf(screen,"ERROR on proc %d: %s (%s:%d)\n",
me,str,file,line); if (input && input->line) lastcmd = input->line;
if (screen) fprintf(screen,"ERROR on proc %d: %s (%s:%d)\n"
"Last command: %s\n",
me,str,file,line,lastcmd);
if (logfile) fprintf(logfile,"ERROR on proc %d: %s (%s:%d)\n"
"Last command: %s\n",
me,str,file,line,lastcmd);
if (universe->nworlds > 1) if (universe->nworlds > 1)
if (universe->uscreen) if (universe->uscreen)
fprintf(universe->uscreen,"ERROR on proc %d: %s (%s:%d)\n", fprintf(universe->uscreen,"ERROR on proc %d: %s (%s:%d)\n",