Fixed possible deadlocks in spatial taper and gauss functions

daniel-koehn · Aug 3, 2023 · 3e373ed · 3e373ed
1 parent 177471f
commit 3e373ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/gauss_filt.c b/src/gauss_filt.c
@@ -212,8 +212,8 @@ void gauss_filt(float ** waveconv)
 	if(MYID==0){printf("\n \t ---- Smoothed gradient is distributed on computational nodes ... ---- \n");}
 
         /* clean up temporary files*/
-        MPI_Barrier(MPI_COMM_WORLD);
+        /*MPI_Barrier(MPI_COMM_WORLD);
         sprintf(jac_tmp,"%s_gauss.old.%i.%i",JACOBIAN,POS[1],POS[2]);
-        remove(jac_tmp);
+        remove(jac_tmp);*/
 
 }
diff --git a/src/gauss_filt_var.c b/src/gauss_filt_var.c
@@ -258,8 +258,8 @@ void gauss_filt_var(float ** waveconv, float ** vel_mod)
 	if(MYID==0){printf("\n \t ---- Smoothed gradient is distributed on computational nodes ... ---- \n");}
 
         /* clean up temporary files*/
-        MPI_Barrier(MPI_COMM_WORLD);
+        /*MPI_Barrier(MPI_COMM_WORLD);
         sprintf(jac_tmp,"%s_gauss.old.%i.%i",JACOBIAN,POS[1],POS[2]);
-        remove(jac_tmp);
+        remove(jac_tmp);*/
 
 }
diff --git a/src/taper_grad_shot.c b/src/taper_grad_shot.c
@@ -16,7 +16,7 @@ void taper_grad_shot(float ** waveconv,float ** taper_coeff, float **srcpos, int
         extern float DH;
 	extern float SRTRADIUS;
 	extern int FREE_SURF, NX, NY, NXG, NYG;
-	extern int NPROCX, NPROCY, MYID_SHOT, POS[3];
+	extern int NPROCX, NPROCY, MYID_SHOT, POS[3], COLOR;
 	extern int SRTSHAPE, FILTSIZE;
         extern char TFILE[STRING_SIZE];
 	extern FILE *FP;
@@ -263,7 +263,7 @@ void taper_grad_shot(float ** waveconv,float ** taper_coeff, float **srcpos, int
 
 
 	MPI_Barrier(SHOT_COMM);
-        sprintf(modfile,"%s_coeff_%i.bin",TFILE,ishot);
+        sprintf(modfile,"%s_coeff_%i_%i.bin",TFILE,ishot,COLOR);
         writemod(modfile,taper_coeff,3); 
         MPI_Barrier(SHOT_COMM);
         if (MYID_SHOT==0) mergemod(modfile,3);