From dca74c118aef6af5b7036ff6f80723666d7d20cc Mon Sep 17 00:00:00 2001 From: Florian Wittkamp Date: Tue, 18 Oct 2016 10:24:39 +0200 Subject: [PATCH] Adjusted WRITE_MEASURED_DATA --- src/IFOS2D.c | 2 +- src/calc_misfit.c | 13 +++++++------ src/saveseis_glob.c | 36 ++++++++++++++++++------------------ 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/IFOS2D.c b/src/IFOS2D.c index 1126327..8aafbd6 100644 --- a/src/IFOS2D.c +++ b/src/IFOS2D.c @@ -2078,7 +2078,7 @@ int main(int argc, char **argv){ /* Write synthetic filtered seismogramms to disk */ - if (SEISMO && TIME_FILT && WRITE_FILTERED_DATA){ + if (SEISMO && TIME_FILT && WRITE_FILTERED_DATA==2){ if(WAVETYPE==1 || WAVETYPE==3){ if ((ADJOINT_TYPE==1)|| (ADJOINT_TYPE==3)){ catseis(sectionvx, fulldata_vx, recswitch, ntr_glob, MPI_COMM_NTR); diff --git a/src/calc_misfit.c b/src/calc_misfit.c index ccce94f..7c4d5dd 100644 --- a/src/calc_misfit.c +++ b/src/calc_misfit.c @@ -29,7 +29,7 @@ double calc_misfit(float **sectiondata, float **section, int ntr, int ns, int LN extern int TRKILL, NORMALIZE, F_LOW_PASS, TIMEWIN; extern char TRKILL_FILE[STRING_SIZE]; extern int VELOCITY; - + extern int WRITE_FILTERED_DATA; int i,j; float l2; int h; @@ -202,14 +202,15 @@ double calc_misfit(float **sectiondata, float **section, int ntr, int ns, int LN } } - for(i=1;i<=ntr;i++){ - for(j=1;j<=ns;j++){ - sectiondata[i][j]=intseis_sectiondata[i][j]; - section[i][j]=intseis_section[i][j]; + if(WRITE_FILTERED_DATA==2){ + for(i=1;i<=ntr;i++){ + for(j=1;j<=ns;j++){ + sectiondata[i][j]=intseis_sectiondata[i][j]; + section[i][j]=intseis_section[i][j]; + } } } - l2=L2; /* printf("\n MYID = %i IN CALC_MISFIT: L2 = %10.12f \n",MYID,l2); */ diff --git a/src/saveseis_glob.c b/src/saveseis_glob.c index 197580a..c049c7b 100644 --- a/src/saveseis_glob.c +++ b/src/saveseis_glob.c @@ -62,40 +62,40 @@ void saveseis_glob(FILE *fp, float **sectionvx, float **sectionvy,float **sectio case 3: if(VELOCITY==0){ - sprintf(vxf,"%s_dx.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); - sprintf(vyf,"%s_dy.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vxf,"%s_dx.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vyf,"%s_dy.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); if(WAVETYPE==2 || WAVETYPE==3) { - sprintf(vzf,"%s_dz.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vzf,"%s_dz.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); } } else { - sprintf(vxf,"%s_vx.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); - sprintf(vyf,"%s_vy.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vxf,"%s_vx.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vyf,"%s_vy.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); if(WAVETYPE==2 || WAVETYPE==3) { - sprintf(vzf,"%s_vz.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vzf,"%s_vz.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); } } - sprintf(pf,"%s_p.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); - sprintf(divf,"%s_div.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); - sprintf(curlf,"%s_curl.su.measured.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(pf,"%s_p.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(divf,"%s_div.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(curlf,"%s_curl.su.obs.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); break; case 4: if(VELOCITY==0){ - sprintf(vxf,"%s_dx.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); - sprintf(vyf,"%s_dy.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vxf,"%s_dx.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vyf,"%s_dy.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); if(WAVETYPE==2 || WAVETYPE==3) { - sprintf(vzf,"%s_dz.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vzf,"%s_dz.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); } } else { - sprintf(vxf,"%s_vx.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); - sprintf(vyf,"%s_vy.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vxf,"%s_vx.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vyf,"%s_vy.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); if(WAVETYPE==2 || WAVETYPE==3) { - sprintf(vzf,"%s_vz.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(vzf,"%s_vz.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); } } - sprintf(pf,"%s_p.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); - sprintf(divf,"%s_div.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); - sprintf(curlf,"%s_curl.su.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(pf,"%s_p.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(divf,"%s_div.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); + sprintf(curlf,"%s_curl.su.syn.filtered.shot%d.it%d",SEIS_FILE,ishot,iter); break; default: -- GitLab