Commit c6b230ed authored by Florian Wittkamp's avatar Florian Wittkamp

BUGFIX: Renaming global variables

parent b71ae24d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
void prepare_update_p(float *etajm, float *peta, float **ppi, float **prho, float **ptaup, float **g, float *bjm, float *cjm, float ***e){ void prepare_update_p(float *etajm, float *peta, float **ppi, float **prho, float **ptaup, float **g, float *bjm, float *cjm, float ***e){
extern int NX, NY, L, INVMAT1, MYID; extern int NX, NY, L, PARAMETERIZATION, MYID;
extern float DT, *FL; extern float DT, *FL;
int i, j, l; int i, j, l;
extern char MFILE[STRING_SIZE]; extern char MFILE[STRING_SIZE];
...@@ -51,7 +51,7 @@ void prepare_update_p(float *etajm, float *peta, float **ppi, float **prho, floa ...@@ -51,7 +51,7 @@ void prepare_update_p(float *etajm, float *peta, float **ppi, float **prho, floa
etajm[l] = peta[l]; etajm[l] = peta[l];
} }
if (INVMAT1==1){ if (PARAMETERIZATION==1){
for (j=1;j<=NY;j++){ for (j=1;j<=NY;j++){
for (i=1;i<=NX;i++){ for (i=1;i<=NX;i++){
pi=(ppi[j][i]*ppi[j][i]*prho[j][i])/(1.0+sumpi*ptaup[j][i]); pi=(ppi[j][i]*ppi[j][i]*prho[j][i])/(1.0+sumpi*ptaup[j][i]);
......
...@@ -32,7 +32,7 @@ void readmod_viscac(float ** rho, float ** pi, float ** taup, float * eta){ ...@@ -32,7 +32,7 @@ void readmod_viscac(float ** rho, float ** pi, float ** taup, float * eta){
extern float DT, *FL, TAU; extern float DT, *FL, TAU;
extern int L; extern int L;
extern int NX, NY, NXG, NYG, POS[3], MYID, INVMAT1; extern int NX, NY, NXG, NYG, POS[3], MYID, PARAMETERIZATION;
extern char MFILE[STRING_SIZE]; extern char MFILE[STRING_SIZE];
extern FILE *FP; extern FILE *FP;
...@@ -55,7 +55,7 @@ void readmod_viscac(float ** rho, float ** pi, float ** taup, float * eta){ ...@@ -55,7 +55,7 @@ void readmod_viscac(float ** rho, float ** pi, float ** taup, float * eta){
/* read density and seismic velocities */ /* read density and seismic velocities */
/* ----------------------------------- */ /* ----------------------------------- */
if(INVMAT1==1){ if(PARAMETERIZATION==1){
fprintf(FP,"\t Vp:\n\t %s.vp\n\n",MFILE); fprintf(FP,"\t Vp:\n\t %s.vp\n\n",MFILE);
sprintf(filename,"%s.vp",MFILE); sprintf(filename,"%s.vp",MFILE);
fp_vp=fopen(filename,"r"); fp_vp=fopen(filename,"r");
......
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