From b48e692b8b4c0077e92bffe8597677c4a971b469 Mon Sep 17 00:00:00 2001 From: Florian Wittkamp Date: Wed, 2 Dec 2015 11:23:25 +0100 Subject: [PATCH] Removed LOG switch --- src/denise.c | 6 ++++-- src/exchange_par.c | 4 +--- src/globvar.h | 2 +- src/note.c | 4 +--- src/read_par_json.c | 5 +---- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/denise.c b/src/denise.c index 5d6014c..3a458de 100644 --- a/src/denise.c +++ b/src/denise.c @@ -220,7 +220,7 @@ int main(int argc, char **argv){ /* If Verbose==0, no PE will write a log file */ if(!VERBOSE) sprintf(LOG_FILE,"/dev/null"); - if ((MYID==0) && (LOG==1)) FP=stdout; + if ((MYID==0)) FP=stdout; else { FP=fopen(LOG_FILE,"w"); } @@ -1165,7 +1165,9 @@ int main(int argc, char **argv){ /* Open Log File for L2 norm */ if(INVMAT!=10){ if(MYID==0){ - if(iter==1){FPL2=fopen(MISFIT_LOG_FILE,"w");} + if(iter==1){ + FPL2=fopen(MISFIT_LOG_FILE,"w"); + } if(iter>1){FPL2=fopen(MISFIT_LOG_FILE,"a");} } } diff --git a/src/exchange_par.c b/src/exchange_par.c index a75160c..f3f2191 100644 --- a/src/exchange_par.c +++ b/src/exchange_par.c @@ -34,7 +34,7 @@ void exchange_par(void){ extern float XREC1, XREC2, YREC1, YREC2, FPML; extern float REC_ARRAY_DEPTH, REC_ARRAY_DIST, MUN, EPSILON, EPSILON_u, EPSILON_rho; extern int SEISMO, NDT, NGEOPH, SEIS_FORMAT, FREE_SURF, READMOD, READREC, SRCREC; - extern int BOUNDARY, REC_ARRAY, DRX, LOG, FW; + extern int BOUNDARY, REC_ARRAY, DRX, FW; extern int SNAPSHOT_START,SNAPSHOT_END,SNAPSHOT_INCR; extern float TSNAP1, TSNAP2, TSNAPINC, REFREC[4]; extern char MFILE[STRING_SIZE], SIGNAL_FILE[STRING_SIZE],SIGNAL_FILE_SH[STRING_SIZE], LOG_FILE[STRING_SIZE]; @@ -204,7 +204,6 @@ void exchange_par(void){ idum[1] = NPROCX; idum[2] = NPROCY; - idum[3] = LOG; idum[4] = NPROCX*NPROCY; idum[5] = NX; @@ -474,7 +473,6 @@ void exchange_par(void){ NPROCX = idum[1]; NPROCY = idum[2]; - LOG=idum[3]; NPROC = idum[4]; NX = idum[5]; NY = idum[6]; diff --git a/src/globvar.h b/src/globvar.h index 3f16823..9239423 100644 --- a/src/globvar.h +++ b/src/globvar.h @@ -15,7 +15,7 @@ float XREC1, XREC2, YREC1, YREC2; float REC_ARRAY_DEPTH, REC_ARRAY_DIST; float REFREC[4]={0.0, 0.0, 0.0, 0.0}, FPML; int SEISMO, NDT, NGEOPH, NSRC=1, SEIS_FORMAT, FREE_SURF, READMOD, READREC, SRCREC, FW=0; -int NX, NY, NT, QUELLART,QUELLART_SH, QUELLTYP, SNAP, SNAP_FORMAT, LOG, REC_ARRAY, RUN_MULTIPLE_SHOTS, NTRG; +int NX, NY, NT, QUELLART,QUELLART_SH, QUELLTYP, SNAP, SNAP_FORMAT, REC_ARRAY, RUN_MULTIPLE_SHOTS, NTRG; int L, BOUNDARY, DC, DRX, NXG, NYG, IDX, IDY, CHECKPTREAD, CHECKPTWRITE, FDORDER, MAXRELERROR; char SNAP_FILE[STRING_SIZE], SOURCE_FILE[STRING_SIZE], SIGNAL_FILE[STRING_SIZE], SIGNAL_FILE_SH[STRING_SIZE]; char MFILE[STRING_SIZE], REC_FILE[STRING_SIZE], CHECKPTFILE[STRING_SIZE]; diff --git a/src/note.c b/src/note.c index a9bc1bf..24cf667 100644 --- a/src/note.c +++ b/src/note.c @@ -27,7 +27,7 @@ void note(FILE *fp){ extern char LOG_FILE[STRING_SIZE]; -extern int MYID, LOG; +extern int MYID; fprintf(fp," Please note: \n"); fprintf(fp," Each processing element (PE) is writing log information during program \n"); @@ -36,6 +36,4 @@ extern int MYID, LOG; fprintf(fp," Information about overall program execution \n"); fprintf(fp," (numerical artefacts, accuracy, computing times etc) \n"); fprintf(fp," will be written by PE 0 to "); - if (LOG==1) fprintf(fp," standard output. \n"); - else fprintf(fp," %s.%i .\n",LOG_FILE,MYID); } diff --git a/src/read_par_json.c b/src/read_par_json.c index ea93a34..e232a36 100644 --- a/src/read_par_json.c +++ b/src/read_par_json.c @@ -33,7 +33,7 @@ void read_par_json(FILE *fp, char *fileinp){ extern float XREC1, XREC2, YREC1, YREC2, FPML; extern float REC_ARRAY_DEPTH, REC_ARRAY_DIST; extern int SEISMO, NDT, NGEOPH, SEIS_FORMAT, FREE_SURF, READMOD, READREC, SRCREC, RUN_MULTIPLE_SHOTS; - extern int BOUNDARY, REC_ARRAY, DRX, LOG, TAPER, TAPERLENGTH, INVTYPE, FW; + extern int BOUNDARY, REC_ARRAY, DRX, TAPER, TAPERLENGTH, INVTYPE, FW; extern float TSNAP1, TSNAP2, TSNAPINC, REFREC[4]; extern int SNAPSHOT_START,SNAPSHOT_END,SNAPSHOT_INCR; extern char MFILE[STRING_SIZE], SIGNAL_FILE[STRING_SIZE], SIGNAL_FILE_SH[STRING_SIZE], LOG_FILE[STRING_SIZE]; @@ -368,9 +368,6 @@ void read_par_json(FILE *fp, char *fileinp){ } if (get_string_from_objectlist("MFILE",number_readobjects,MFILE,varname_list, value_list)) err("Variable MFILE could not be retrieved from the json input file!"); - if (get_int_from_objectlist("LOG",number_readobjects,&LOG,varname_list, value_list)){ - LOG=1; - fprintf(fp,"Variable LOG is set to default value %d.\n",LOG);} if (get_int_from_objectlist("CHECKPTREAD",number_readobjects,&CHECKPTREAD,varname_list, value_list)){ CHECKPTREAD=0; fprintf(fp,"Variable CHECKPTREAD is set to default value %d.\n",CHECKPTREAD);} -- GitLab