Commit 516317df authored by Florian Wittkamp's avatar Florian Wittkamp

Renaming a few global variables

Renaming:
QUELLART     ->  SOURCE_SHAPE
QUELLTYP     ->  SOURCE_TYPE
QUELLTYPB   ->  ADJOINT_TYPE
DAMPING       ->  VPPML
parent 941b00c8
This diff is collapsed.
......@@ -25,10 +25,10 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"SOURCE_SHAPE" : "4",
"SIGNAL_FILE" : "./ormsby.dat",
"QUELLTYP" : "3",
"SOURCE_TYPE" : "3",
"SOURCE_FILE" : "./source/sources.dat",
"RUN_MULTIPLE_SHOTS" : "1",
......@@ -42,7 +42,7 @@
"PML Boundary" : "comment",
"FW" : "20",
"DAMPING" : "600.0",
"VPPML" : "600.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......
......@@ -24,13 +24,13 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5" : "comment",
"QUELLART values: Spike=6;from_SIGNAL_FILE_in_su_format=7;integral_of_SIN**3=8" : "comment",
"SOURCE_SHAPE" : "4",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5" : "comment",
"SOURCE_SHAPE values: Spike=6;from_SIGNAL_FILE_in_su_format=7;integral_of_SIN**3=8" : "comment",
"SIGNAL_FILE" : "./ormsby.dat",
"QUELLTYP" : "3",
"QUELLTYP values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "3",
"SOURCE_TYPE values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_FILE" : "./source/sources.dat",
"RUN_MULTIPLE_SHOTS" : "1",
......@@ -44,7 +44,7 @@
"PML Boundary" : "comment",
"FW" : "20",
"DAMPING" : "600.0",
"VPPML" : "600.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......
......@@ -24,13 +24,13 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5" : "comment",
"QUELLART values: Spike=6;from_SIGNAL_FILE_in_su_format=7;integral_of_SIN**3=8" : "comment",
"SOURCE_SHAPE" : "4",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5" : "comment",
"SOURCE_SHAPE values: Spike=6;from_SIGNAL_FILE_in_su_format=7;integral_of_SIN**3=8" : "comment",
"SIGNAL_FILE" : "./ormsby.dat",
"QUELLTYP" : "3",
"QUELLTYP values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "3",
"SOURCE_TYPE values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_FILE" : "./source/sources.dat",
"RUN_MULTIPLE_SHOTS" : "1",
......@@ -50,7 +50,7 @@
"PML Boundary" : "comment",
"FW" : "20",
"DAMPING" : "600.0",
"VPPML" : "600.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......
......@@ -24,13 +24,13 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5" : "comment",
"QUELLART values: Spike=6;from_SIGNAL_FILE_in_su_format=7;integral_of_SIN**3=8" : "comment",
"SOURCE_SHAPE" : "4",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5" : "comment",
"SOURCE_SHAPE values: Spike=6;from_SIGNAL_FILE_in_su_format=7;integral_of_SIN**3=8" : "comment",
"SIGNAL_FILE" : "./ormsby.dat",
"QUELLTYP" : "3",
"QUELLTYP values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "3",
"SOURCE_TYPE values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_FILE" : "./source/sources.dat",
"RUN_MULTIPLE_SHOTS" : "1",
......@@ -44,7 +44,7 @@
"PML Boundary" : "comment",
"FW" : "20",
"DAMPING" : "600.0",
"VPPML" : "600.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......@@ -68,7 +68,7 @@
"DATA_DIR" : "su/measured_data/IFOS_real",
"INVMAT1" : "1",
"INVMAT" : "0",
"QUELLTYPB" : "1",
"ADJOINT_TYPE" : "1",
"Output of inverted models" : "comment",
"INV_MODELFILE" : "model/modelTest",
......
......@@ -24,13 +24,13 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5" : "comment",
"QUELLART values: Spike=6;from_SIGNAL_FILE_in_su_format=7;integral_of_SIN**3=8" : "comment",
"SOURCE_SHAPE" : "4",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5" : "comment",
"SOURCE_SHAPE values: Spike=6;from_SIGNAL_FILE_in_su_format=7;integral_of_SIN**3=8" : "comment",
"SIGNAL_FILE" : "./STF/stf.su",
"QUELLTYP" : "3",
"QUELLTYP values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "3",
"SOURCE_TYPE values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_FILE" : "./source/sources.dat",
"RUN_MULTIPLE_SHOTS" : "1",
......@@ -50,7 +50,7 @@
"PML Boundary" : "comment",
"FW" : "20",
"DAMPING" : "600.0",
"VPPML" : "600.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......@@ -97,7 +97,7 @@
"DATA_DIR" : "su/measured_data/IFOS_real",
"INVMAT1" : "1",
"INVMAT" : "0",
"QUELLTYPB" : "1",
"ADJOINT_TYPE" : "1",
"MISFIT_LOG_FILE" : "L2_LOG.dat",
"VELOCITY" : "0",
......
......@@ -24,12 +24,12 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SOURCE_SHAPE" : "4",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SIGNAL_FILE" : "./ormsby.dat",
"QUELLTYP" : "3",
"QUELLTYP values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "3",
"SOURCE_TYPE values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SRCREC" : "1",
"SRCREC values : read source positions from SOURCE_FILE=1, PLANE_WAVE=2" : "comment",
......@@ -52,7 +52,7 @@
"PML Boundary" : "comment",
"FW" : "20",
"DAMPING" : "1700.0",
"VPPML" : "1700.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......
......@@ -24,15 +24,15 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"QUELLART_SH" : "4",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SOURCE_SHAPE" : "4",
"SOURCE_SHAPE_SH" : "4",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SIGNAL_FILE" : "./ormsby.dat",
"SIGNAL_FILE_SH" : "./ormsby.dat",
"QUELLTYP" : "3",
"QUELLTYP values (point_source) P-SV: explosive=1;force_in_x=2;force_in_y=3;force_in_z=5;rotated_force=4" : "comment",
"SOURCE_TYPE" : "3",
"SOURCE_TYPE values (point_source) P-SV: explosive=1;force_in_x=2;force_in_y=3;force_in_z=5;rotated_force=4" : "comment",
"SRCREC" : "1",
"SRCREC values : read source positions from SOURCE_FILE=1, PLANE_WAVE=2" : "comment",
......@@ -55,7 +55,7 @@
"PML Boundary" : "comment",
"FW" : "10",
"DAMPING" : "1700.0",
"VPPML" : "1700.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......
......@@ -24,12 +24,12 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SOURCE_SHAPE" : "4",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SIGNAL_FILE" : "./ormsby.dat",
"QUELLTYP" : "3",
"QUELLTYP values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "3",
"SOURCE_TYPE values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SRCREC" : "1",
"SRCREC values : read source positions from SOURCE_FILE=1, PLANE_WAVE=2" : "comment",
......@@ -49,7 +49,7 @@
"PML Boundary" : "comment",
"FW" : "20",
"DAMPING" : "1700.0",
"VPPML" : "1700.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......@@ -79,7 +79,7 @@
"DATA_DIR" : "su/measured_data/toy_example",
"INVMAT1" : "1",
"INVMAT" : "0",
"QUELLTYPB" : "1",
"ADJOINT_TYPE" : "1",
"MISFIT_LOG_FILE" : "LOG_toy_example.dat",
"Inversion for parameter starting from iteration" : "comment",
......
......@@ -24,15 +24,15 @@
"DT" : "5.0e-05",
"Source" : "comment",
"QUELLART" : "4",
"QUELLART_SH" : "4",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SOURCE_SHAPE" : "4",
"SOURCE_SHAPE_SH" : "4",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SIGNAL_FILE" : "./ormsby.dat",
"SIGNAL_FILE_SH" : "./ormsby.dat",
"QUELLTYP" : "3",
"QUELLTYP values (point_source) P-SV: explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "3",
"SOURCE_TYPE values (point_source) P-SV: explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SRCREC" : "1",
"SRCREC values : read source positions from SOURCE_FILE=1, PLANE_WAVE=2" : "comment",
......@@ -55,7 +55,7 @@
"PML Boundary" : "comment",
"FW" : "10",
"DAMPING" : "300.0",
"VPPML" : "300.0",
"FPML" : "31.25",
"BOUNDARY" : "0",
"npower" : "4.0",
......@@ -85,8 +85,8 @@
"DATA_DIR" : "su/measured_data/toy_example",
"INVMAT1" : "1",
"INVMAT" : "0",
"QUELLTYPB" : "1",
"QUELLTYPB values: 1=x y; 2=x; 3=y; 4=z; 5=x y z" : "comment",
"ADJOINT_TYPE" : "1",
"ADJOINT_TYPE values: 1=x y; 2=x; 3=y; 4=z; 5=x y z" : "comment",
"MISFIT_LOG_FILE" : "LOG_toy_example.dat",
"Inversion for parameter starting from iteration" : "comment",
......
......@@ -24,12 +24,12 @@
"DT" : "1.0e-03",
"Source" : "comment",
"QUELLART" : "1",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SOURCE_SHAPE" : "1",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SIGNAL_FILE" : "./ormsby.dat",
"QUELLTYP" : "1",
"QUELLTYP values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "1",
"SOURCE_TYPE values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SRCREC" : "1",
"SRCREC values : read source positions from SOURCE_FILE=1, PLANE_WAVE=2" : "comment",
......@@ -49,7 +49,7 @@
"PML Boundary" : "comment",
"FW" : "30",
"DAMPING" : "2100.0",
"VPPML" : "2100.0",
"FPML" : "8.0",
"BOUNDARY" : "0",
"npower" : "4.0",
......
......@@ -24,12 +24,12 @@
"DT" : "1.0e-03",
"Source" : "comment",
"QUELLART" : "1",
"QUELLART values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SOURCE_SHAPE" : "1",
"SOURCE_SHAPE values: ricker=1;fumue=2;from_SIGNAL_FILE=3;SIN**3=4;Gaussian_deriv=5;Spike=6" : "comment",
"SIGNAL_FILE" : "./STF/inverted_wavelet.seis",
"QUELLTYP" : "1",
"QUELLTYP values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SOURCE_TYPE" : "1",
"SOURCE_TYPE values (point_source): explosive=1;force_in_x=2;force_in_y=3;rotated_force=4" : "comment",
"SRCREC" : "1",
"SRCREC values : read source positions from SOURCE_FILE=1, PLANE_WAVE=2" : "comment",
......@@ -49,7 +49,7 @@
"PML Boundary" : "comment",
"FW" : "30",
"DAMPING" : "2100.0",
"VPPML" : "2100.0",
"FPML" : "8.0",
"BOUNDARY" : "0",
"npower" : "4.0",
......@@ -79,7 +79,7 @@
"DATA_DIR" : "su/measured_data/toy_example_ac",
"INVMAT1" : "1",
"INVMAT" : "0",
"QUELLTYPB" : "4",
"ADJOINT_TYPE" : "4",
"MISFIT_LOG_FILE" : "LOG_toy_example_ac.dat",
"Inversion for parameter starting from iteration" : "comment",
......
......@@ -88,7 +88,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
/* extern variables */
extern float DH, DAMPING, DT, FPML;
extern float DH, VPPML, DT, FPML;
extern int FREE_SURF, NX, NY, BOUNDARY, NXG, NYG;
extern int NPROCX, NPROCY, MYID, POS[3], FW;
extern FILE *FP;
......@@ -118,10 +118,10 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
Rcoef = 0.001;
/* compute d0 from INRIA report section 6.1 */
d0_x = - (npower + 1) * DAMPING * log(Rcoef) / (2.0 * thickness_PML_x);
d0_y = - (npower + 1) * DAMPING * log(Rcoef) / (2.0 * thickness_PML_y);
d0_x = - (npower + 1) * VPPML * log(Rcoef) / (2.0 * thickness_PML_x);
d0_y = - (npower + 1) * VPPML * log(Rcoef) / (2.0 * thickness_PML_y);
/* damping in the X direction */
/* VPPML in the X direction */
/* -------------------------- */
/* origin of the PML layer (position of right edge minus thickness, in meters) */
......@@ -136,7 +136,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
K_x_half[i] = 1.0;
xval = DH * (i-1);
/* define damping profile at the grid points */
/* define VPPML profile at the grid points */
abscissa_in_PML = xoriginleft - xval;
if(abscissa_in_PML >= 0.0){
......@@ -148,7 +148,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
alpha_prime_x[i] = alpha_max_PML * (1.0 - abscissa_normalized);
}
/* define damping profile at half the grid points */
/* define VPPML profile at half the grid points */
abscissa_in_PML = xoriginleft - (xval + DH/2.0);
if(abscissa_in_PML >= 0.0){
......@@ -183,7 +183,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
K_x_half[h] = 1.0;
xval = DH * (i-1);
/* define damping profile at the grid points */
/* define VPPML profile at the grid points */
abscissa_in_PML = xval - xoriginright;
if(abscissa_in_PML >= 0.0){
......@@ -195,7 +195,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
alpha_prime_x[h] = alpha_max_PML * (1.0 - abscissa_normalized);
}
/* define damping profile at half the grid points */
/* define VPPML profile at half the grid points */
abscissa_in_PML = xval + DH/2.0 - xoriginright;
if(abscissa_in_PML >= 0.0){
......@@ -223,7 +223,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
/* damping in the Y direction */
/* VPPML in the Y direction */
/* -------------------------- */
/* origin of the PML layer (position of right edge minus thickness, in meters) */
......@@ -238,7 +238,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
/* left boundary */
/* define damping profile at the grid points */
/* define VPPML profile at the grid points */
abscissa_in_PML = yoriginbottom - yval;
if(abscissa_in_PML >= 0.0){
......@@ -250,7 +250,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
alpha_prime_y[i] = alpha_max_PML * (1.0 - abscissa_normalized);
}
/* define damping profile at half the grid points */
/* define VPPML profile at half the grid points */
abscissa_in_PML = yoriginbottom - (yval + DH/2.0);
if(abscissa_in_PML >= 0.0){
......@@ -279,7 +279,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
K_y_half[h] = 1.0;
yval = DH * (i-1);
/* define damping profile at the grid points */
/* define VPPML profile at the grid points */
abscissa_in_PML = yval - yorigintop;
if(abscissa_in_PML >= 0.0){
......@@ -291,7 +291,7 @@ void PML_pro(float * d_x, float * K_x, float * alpha_prime_x, float * a_x, float
alpha_prime_y[h] = alpha_max_PML * (1.0 - abscissa_normalized);
}
/* define damping profile at half the grid points */
/* define VPPML profile at half the grid points */
abscissa_in_PML = yval + DH/2.0 - yorigintop;
if(abscissa_in_PML >= 0.0){
......
......@@ -29,8 +29,8 @@
void exchange_par(void){
/* declaration of extern variables */
extern int NX, NY, FDORDER, MAXRELERROR, QUELLART, QUELLTYP, SNAP, SNAP_FORMAT, L;
extern float DH, TIME, DT, TS, *FL, TAU, DAMPING, PLANE_WAVE_DEPTH, PHI, F_REF;
extern int NX, NY, FDORDER, MAXRELERROR, SOURCE_SHAPE, SOURCE_TYPE, SNAP, SNAP_FORMAT, L;
extern float DH, TIME, DT, TS, *FL, TAU, VPPML, PLANE_WAVE_DEPTH, PHI, F_REF;
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;
......@@ -43,7 +43,7 @@ void exchange_par(void){
extern char JACOBIAN[STRING_SIZE], DATA_DIR[STRING_SIZE], INV_MODELFILE[STRING_SIZE], FREQ_FILE[STRING_SIZE];
extern int RUN_MULTIPLE_SHOTS, TAPERLENGTH, INVTYPE;
extern int NPROC, NPROCX, NPROCY, MYID, IDX, IDY;
extern int GRADT1, GRADT2, GRADT3, GRADT4, ITERMAX, INVMAT1, INVMAT, QUELLTYPB;
extern int GRADT1, GRADT2, GRADT3, GRADT4, ITERMAX, INVMAT1, INVMAT, ADJOINT_TYPE;
extern int GRAD_METHOD;
extern float TSHIFT_back;
extern int MODEL_FILTER, FILT_SIZE;
......@@ -88,7 +88,7 @@ void exchange_par(void){
// Parameter for inversion of SH waves and joint inversion
extern int WAVETYPE;
extern int QUELLART_SH;
extern int SOURCE_SHAPE_SH;
extern int JOINT_INVERSION_PSV_SH_TYPE;
/* Workflow */
extern char FILE_WORKFLOW[STRING_SIZE];
......@@ -147,7 +147,7 @@ void exchange_par(void){
fdum[19] = XREC2;
fdum[20] = YREC2;
fdum[22] = DAMPING;
fdum[22] = VPPML;
fdum[23] = REC_ARRAY_DEPTH;
fdum[24] = REC_ARRAY_DIST;
fdum[25] = PLANE_WAVE_DEPTH;
......@@ -219,8 +219,8 @@ void exchange_par(void){
idum[5] = NX;
idum[6] = NY;
idum[8] = QUELLART;
idum[9] = QUELLTYP;
idum[8] = SOURCE_SHAPE;
idum[9] = SOURCE_TYPE;
idum[10] = READMOD;
idum[11] = L;
idum[12] = FREE_SURF;
......@@ -255,7 +255,7 @@ void exchange_par(void){
idum[41] = INVMAT1;
idum[42] = FW;
idum[43] = INVMAT;
idum[44] = QUELLTYPB;
idum[44] = ADJOINT_TYPE;
idum[45] = TESTSHOT_START;
idum[46] = TESTSHOT_END;
......@@ -330,7 +330,7 @@ void exchange_par(void){
idum[93] = WAVETYPE;
idum[94] = QUELLART_SH;
idum[94] = SOURCE_SHAPE_SH;
idum[95] = JOINT_INVERSION_PSV_SH_TYPE;
......@@ -420,7 +420,7 @@ void exchange_par(void){
XREC2=fdum[19];
YREC2=fdum[20];
DAMPING=fdum[22];
VPPML=fdum[22];
REC_ARRAY_DEPTH=fdum[23];
REC_ARRAY_DIST=fdum[24];
PLANE_WAVE_DEPTH=fdum[25];
......@@ -494,8 +494,8 @@ void exchange_par(void){
NX = idum[5];
NY = idum[6];
QUELLART = idum[8];
QUELLTYP = idum[9];
SOURCE_SHAPE = idum[8];
SOURCE_TYPE = idum[9];
READMOD = idum[10];
L = idum[11];
FREE_SURF = idum[12];
......@@ -530,7 +530,7 @@ void exchange_par(void){
INVMAT1 = idum[41];
FW = idum[42];
INVMAT = idum[43];
QUELLTYPB = idum[44];
ADJOINT_TYPE = idum[44];
TESTSHOT_START = idum[45];
TESTSHOT_END = idum[46];
......@@ -606,7 +606,7 @@ void exchange_par(void){
WAVETYPE = idum[93];
QUELLART_SH = idum[94];
SOURCE_SHAPE_SH = idum[94];
JOINT_INVERSION_PSV_SH_TYPE = idum[95];
......
......@@ -9,13 +9,13 @@
/* Add new variables also in exchange_par.c and read_par_json.c */
float XS, YS, DH, TIME, DT, TS, DAMPING, PLANE_WAVE_DEPTH, PHI;
float XS, YS, DH, TIME, DT, TS, VPPML, PLANE_WAVE_DEPTH, PHI;
float TSNAP1, TSNAP2, TSNAPINC, *FL, TAU, F_REF;
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, REC_ARRAY, RUN_MULTIPLE_SHOTS, NTRG;
int NX, NY, NT, SOURCE_SHAPE,SOURCE_SHAPE_SH, SOURCE_TYPE, SNAP, SNAP_FORMAT, REC_ARRAY, RUN_MULTIPLE_SHOTS, NTRG;
int L, BOUNDARY, DC, DRX, NXG, NYG, IDX, IDY, 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];
......@@ -42,7 +42,7 @@ int WORKFLOW_STAGE;
int TAPER, TAPERLENGTH, INVTYPE;
int GRADT1,GRADT2,GRADT3,GRADT4;
int ITERMAX, REC1, REC2, INVMAT1, INVMAT, QUELLTYPB;
int ITERMAX, REC1, REC2, INVMAT1, INVMAT, ADJOINT_TYPE;
int GRAD_METHOD;
float TSHIFT_back;
int MODEL_FILTER, FILT_SIZE;
......
This diff is collapsed.
......@@ -28,8 +28,8 @@ char ** varname_list,** value_list;
void read_par_json(FILE *fp, char *fileinp){
/* declaration of extern variables */
extern int NX, NY, FDORDER, MAXRELERROR, QUELLART,QUELLART_SH, QUELLTYP, SNAP, SNAP_FORMAT, ACOUSTIC, L, VERBOSE, WAVETYPE,JOINT_INVERSION_PSV_SH_TYPE;
extern float DH, TIME, DT, TS, *FL, TAU, DAMPING, PLANE_WAVE_DEPTH, PHI, F_REF,JOINT_INVERSION_PSV_SH_ALPHA_VS,JOINT_INVERSION_PSV_SH_ALPHA_RHO;
extern int NX, NY, FDORDER, MAXRELERROR, SOURCE_SHAPE,SOURCE_SHAPE_SH, SOURCE_TYPE, SNAP, SNAP_FORMAT, ACOUSTIC, L, VERBOSE, WAVETYPE,JOINT_INVERSION_PSV_SH_TYPE;
extern float DH, TIME, DT, TS, *FL, TAU, VPPML, PLANE_WAVE_DEPTH, PHI, F_REF,JOINT_INVERSION_PSV_SH_ALPHA_VS,JOINT_INVERSION_PSV_SH_ALPHA_RHO;
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;
......@@ -41,7 +41,7 @@ void read_par_json(FILE *fp, char *fileinp){
extern char SEIS_FILE[STRING_SIZE];
extern char JACOBIAN[STRING_SIZE],DATA_DIR[STRING_SIZE],FREQ_FILE[STRING_SIZE];
extern int NPROCX, NPROCY, MYID, IDX, IDY;
extern int GRADT1, GRADT2, GRADT3, GRADT4, ITERMAX, INVMAT1, INVMAT, QUELLTYPB;
extern int GRADT1, GRADT2, GRADT3, GRADT4, ITERMAX, INVMAT1, INVMAT, ADJOINT_TYPE;
extern int GRAD_METHOD;
extern float TSHIFT_back;
extern int FILT_SIZE, MODEL_FILTER;
......@@ -172,7 +172,7 @@ void read_par_json(FILE *fp, char *fileinp){
fprintf(fp,"The following default values are set:\n");
fprintf(fp,"=====================================\n\n");
if (get_int_from_objectlist("QUELLTYP",number_readobjects,&QUELLTYP,varname_list, value_list))
if (get_int_from_objectlist("SOURCE_TYPE",number_readobjects,&SOURCE_TYPE,varname_list, value_list))
err("Variable SOURCE_TYPE could not be retrieved from the json input file!");
/* Definition of inversion for source time function */
......@@ -223,10 +223,10 @@ void read_par_json(FILE *fp, char *fileinp){
}
}
if (get_int_from_objectlist("QUELLART",number_readobjects,&QUELLART,varname_list, value_list))
err("Variable QUELLART could not be retrieved from the json input file!");
if (get_int_from_objectlist("SOURCE_SHAPE",number_readobjects,&SOURCE_SHAPE,varname_list, value_list))
err("Variable SOURCE_SHAPE could not be retrieved from the json input file!");
else {
if ((QUELLART==3)||(QUELLART==7)||(INV_STF==1)) {
if ((SOURCE_SHAPE==3)||(SOURCE_SHAPE==7)||(INV_STF==1)) {
if (WAVETYPE==1 || WAVETYPE==3){
if (get_string_from_objectlist("SIGNAL_FILE",number_readobjects,SIGNAL_FILE,varname_list, value_list))
err("Variable SIGNAL_FILE could not be retrieved from the json input file!");
......@@ -237,9 +237,9 @@ void read_par_json(FILE *fp, char *fileinp){
}
}
}
if (get_int_from_objectlist("QUELLART_SH",number_readobjects,&QUELLART_SH,varname_list, value_list)){
if (get_int_from_objectlist("SOURCE_SHAPE_SH",number_readobjects,&SOURCE_SHAPE_SH,varname_list, value_list)){
if (WAVETYPE==2 || WAVETYPE==3){
err("Variable QUELLART_SH could not be retrieved from the json input file!");
err("Variable SOURCE_SHAPE_SH could not be retrieved from the json input file!");
}
}
if (get_int_from_objectlist("SRCREC",number_readobjects,&SRCREC,varname_list, value_list)){
......@@ -277,8 +277,8 @@ void read_par_json(FILE *fp, char *fileinp){
err("Variable BOUNDARY could not be retrieved from the json input file!");
if (get_int_from_objectlist("FW",number_readobjects,&FW,varname_list, value_list))
err("Variable FW could not be retrieved from the json input file!");
if (get_float_from_objectlist("DAMPING",number_readobjects,&DAMPING,varname_list, value_list))
err("Variable DAMPING could not be retrieved from the json input file!");
if (get_float_from_objectlist("VPPML",number_readobjects,&VPPML,varname_list, value_list))
err("Variable VPPML could not be retrieved from the json input file!");
if (get_float_from_objectlist("FPML",number_readobjects,&FPML,varname_list, value_list))
err("Variable FPML could not be retrieved from the json input file!");
if (get_float_from_objectlist("npower",number_readobjects,&npower,varname_list, value_list))
......@@ -451,8 +451,8 @@ void read_par_json(FILE *fp, char *fileinp){
if (get_int_from_objectlist("INVTYPE",number_readobjects,&INVTYPE,varname_list, value_list)){
INVTYPE=2;
fprintf(fp,"\nVariable INVTYPE is set to default value %d.\n",INVTYPE);}
if (get_int_from_objectlist("QUELLTYPB",number_readobjects,&QUELLTYPB,varname_list, value_list))
err("Variable QUELLTYPB could not be retrieved from the json input file!");
if (get_int_from_objectlist("ADJOINT_TYPE",number_readobjects,&ADJOINT_TYPE,varname_list, value_list))
err("Variable ADJOINT_TYPE could not be retrieved from the json input file!");
if (get_string_from_objectlist("MISFIT_LOG_FILE",number_readobjects,MISFIT_LOG_FILE,varname_list, value_list)){
strcpy(MISFIT_LOG_FILE,"L2_LOG.dat");
......@@ -843,7 +843,7 @@ void read_par_json(FILE *fp, char *fileinp){
}
/* Time windowing and damping */
/* Time windowing and VPPML */
if (get_int_from_objectlist("TIMEWIN",number_readobjects,&TIMEWIN,varname_list, value_list)){
TIMEWIN=0;
fprintf(fp,"Variable TIMEWIN is set to default value %d.\n",TIMEWIN);}
......@@ -888,7 +888,7 @@ void read_par_json(FILE *fp, char *fileinp){
/********************************************/
/* signal file */
if (QUELLART == 3)
if (SOURCE_SHAPE == 3)
{
if (access(SIGNAL_FILE,0) != 0)
{
......
......@@ -31,7 +31,7 @@ float **sources(int *nsrc){
/* declaration of extern variables */
extern float PLANE_WAVE_DEPTH, PHI, TS, DH, F_REF;
extern char SOURCE_FILE[STRING_SIZE];
extern int MYID, NXG, NYG, SRCREC, RUN_MULTIPLE_SHOTS, QUELLTYP;
extern int MYID, NXG, NYG, SRCREC, RUN_MULTIPLE_SHOTS, SOURCE_TYPE;
extern FILE *FP;
float **srcpos;
......@@ -76,7 +76,7 @@ float **sources(int *nsrc){
case 5: if (MYID==0) fprintf(FP," No amplitude defined for source %i in %s!\n",l, SOURCE_FILE);
err("Missing parameter in SOURCE_FILE!");
case 6: srcpos[7][l]=0.0;
case 7: srcpos[8][l]=QUELLTYP;
case 7: srcpos[8][l]=SOURCE_TYPE;
}
if ((srcpos[8][l]!=4) && (nvarin>6)) {
current_source=(int)srcpos[8][l];
......
......@@ -30,7 +30,7 @@ int ntr_glob,int ntr, float ** srcpos, int ishot, int ns, int iter, int nshots,
/* declaration of global variables */
extern float DT, DH;
extern int SEIS_FORMAT, MYID, NT, QUELLART, TIME_FILT, TIMEWIN, TAPER_STF;
extern int SEIS_FORMAT, MYID, NT, SOURCE_SHAPE, TIME_FILT, TIMEWIN, TAPER_STF;
extern char PARA[STRING_SIZE], DATA_DIR[STRING_SIZE];
extern int TRKILL_STF, NORMALIZE, USE_WORKFLOW, WORKFLOW_STAGE;
extern char TRKILL_FILE_STF[STRING_SIZE];
......@@ -175,8 +175,8 @@ int ntr_glob,int ntr, float ** srcpos, int ishot, int ns, int iter, int nshots,
psource=vector(1,ns);
if (QUELLART==3) psource=rd_sour(&nts,fopen(SIGNAL_FILE,"r"));
if (QUELLART==7){
if (SOURCE_SHAPE==3) psource=rd_sour(&nts,fopen(SIGNAL_FILE,"r"));
if (SOURCE_SHAPE==7){
inseis_source_wavelet(psource,ns,ishot);
}
......@@ -186,7 +186,7 @@ int ntr_glob,int ntr, float ** srcpos, int ishot, int ns, int iter, int nshots,
ts=1.0/fc;
for (nt=1;nt<=ns;nt++){
t=(float)nt*DT;