Commit 94401689 authored by Florian Wittkamp's avatar Florian Wittkamp

L-BFGS: Changed names of output files

parent 96f22a36
...@@ -99,7 +99,7 @@ void lbfgs(float **grad_vs, float **grad_rho, float **grad_vp,float Vs_avg,float ...@@ -99,7 +99,7 @@ void lbfgs(float **grad_vs, float **grad_rho, float **grad_vp,float Vs_avg,float
/* Debugging */ /* Debugging */
if(!ACOUSTIC) { if(!ACOUSTIC) {
sprintf(jac,"%s_y_LBFGS_vs_it%d_w%d.bin.%i.%i",JACOBIAN,iteration,w,POS[1],POS[2]); sprintf(jac,"%s_y_LBFGS_vs_it%d.bin.%i.%i",JACOBIAN,iteration,POS[1],POS[2]);
FP_JAC=fopen(jac,"wb"); FP_JAC=fopen(jac,"wb");
} }
...@@ -142,10 +142,10 @@ void lbfgs(float **grad_vs, float **grad_rho, float **grad_vp,float Vs_avg,float ...@@ -142,10 +142,10 @@ void lbfgs(float **grad_vs, float **grad_rho, float **grad_vp,float Vs_avg,float
if(!ACOUSTIC) { if(!ACOUSTIC) {
fclose(FP_JAC); fclose(FP_JAC);
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
sprintf(jac,"%s_y_LBFGS_vs_it%d_w%d.bin",JACOBIAN,iteration,w); sprintf(jac,"%s_y_LBFGS_vs_it%d.bin",JACOBIAN,iteration);
if (MYID==0) mergemod(jac,3); if (MYID==0) mergemod(jac,3);
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
sprintf(jac,"%s_y_LBFGS_vs_it%d_w%d.bin.%i.%i",JACOBIAN,iteration,w,POS[1],POS[2]); sprintf(jac,"%s_y_LBFGS_vs_it%d.bin.%i.%i",JACOBIAN,iteration,POS[1],POS[2]);
remove(jac); remove(jac);
} }
......
...@@ -62,17 +62,17 @@ void calc_mat_change_test(float ** waveconv, float ** waveconv_rho, float * ...@@ -62,17 +62,17 @@ void calc_mat_change_test(float ** waveconv, float ** waveconv_rho, float *
if(w==0) w=N_LBFGS; if(w==0) w=N_LBFGS;
if(!ACOUSTIC){ if(!ACOUSTIC){
sprintf(jac,"%s_s_LBFGS_vs_it%d_w%d.bin.%i.%i",JACOBIAN,iter+1,w,POS[1],POS[2]); sprintf(jac,"%s_s_LBFGS_vs_it%d.bin.%i.%i",JACOBIAN,iter+1,POS[1],POS[2]);
FP_JAC=fopen(jac,"wb"); FP_JAC=fopen(jac,"wb");
} }
if(LBFGS_NPAR>1){ if(LBFGS_NPAR>1){
sprintf(jac2,"%s_s_LBFGS_rho_it%d_w%d.bin.%i.%i",JACOBIAN,iter+1,w,POS[1],POS[2]); sprintf(jac2,"%s_s_LBFGS_rho_it%d.bin.%i.%i",JACOBIAN,iter+1,POS[1],POS[2]);
FP_JAC2=fopen(jac2,"wb"); FP_JAC2=fopen(jac2,"wb");
} }
if(LBFGS_NPAR>2){ if(LBFGS_NPAR>2){
sprintf(jac2,"%s_s_LBFGS_vp_it%d_w%d.bin.%i.%i",JACOBIAN,iter+1,w,POS[1],POS[2]); sprintf(jac2,"%s_s_LBFGS_vp_it%d.bin.%i.%i",JACOBIAN,iter+1,POS[1],POS[2]);
FP_JAC3=fopen(jac2,"wb"); FP_JAC3=fopen(jac2,"wb");
} }
...@@ -344,30 +344,30 @@ void calc_mat_change_test(float ** waveconv, float ** waveconv_rho, float * ...@@ -344,30 +344,30 @@ void calc_mat_change_test(float ** waveconv, float ** waveconv_rho, float *
if(!ACOUSTIC){ if(!ACOUSTIC){
fclose(FP_JAC); fclose(FP_JAC);
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
sprintf(jac,"%s_s_LBFGS_vs_it%d_w%d.bin",JACOBIAN,iter+1,w); sprintf(jac,"%s_s_LBFGS_vs_it%d.bin",JACOBIAN,iter+1);
if (MYID==0) mergemod(jac,3); if (MYID==0) mergemod(jac,3);
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
sprintf(jac,"%s_s_LBFGS_vs_it%d_w%d.bin.%i.%i",JACOBIAN,iter+1,w,POS[1],POS[2]); sprintf(jac,"%s_s_LBFGS_vs_it%d.bin.%i.%i",JACOBIAN,iter+1,POS[1],POS[2]);
remove(jac); remove(jac);
} }
if(LBFGS_NPAR>1){ if(LBFGS_NPAR>1){
fclose(FP_JAC2); fclose(FP_JAC2);
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
sprintf(jac,"%s_s_LBFGS_rho_it%d_w%d.bin",JACOBIAN,iter+1,w); sprintf(jac,"%s_s_LBFGS_rho_it%d.bin",JACOBIAN,iter+1);
if (MYID==0) mergemod(jac,3); if (MYID==0) mergemod(jac,3);
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
sprintf(jac,"%s_s_LBFGS_rho_it%d_w%d.bin.%i.%i",JACOBIAN,iter+1,w,POS[1],POS[2]); sprintf(jac,"%s_s_LBFGS_rho_it%d.bin.%i.%i",JACOBIAN,iter+1,POS[1],POS[2]);
remove(jac); remove(jac);
} }
if(LBFGS_NPAR>2){ if(LBFGS_NPAR>2){
fclose(FP_JAC3); fclose(FP_JAC3);
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
sprintf(jac,"%s_s_LBFGS_vp_it%d_w%d.bin",JACOBIAN,iter+1,w); sprintf(jac,"%s_s_LBFGS_vp_it%d.bin",JACOBIAN,iter+1);
if (MYID==0) mergemod(jac,3); if (MYID==0) mergemod(jac,3);
MPI_Barrier(MPI_COMM_WORLD); MPI_Barrier(MPI_COMM_WORLD);
sprintf(jac,"%s_s_LBFGS_vp_it%d_w%d.bin.%i.%i",JACOBIAN,iter+1,w,POS[1],POS[2]); sprintf(jac,"%s_s_LBFGS_vp_it%d.bin.%i.%i",JACOBIAN,iter+1,POS[1],POS[2]);
remove(jac); remove(jac);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment