diff --git a/Makefile b/Makefile
index cda1ad6cbee3775abbeeec2980fa403a9a7f2bae..b85040fdfba64a2b9366a7c20369765ba55c5119 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ all: mkdirs
cd utils ; $(MAKE) install
cd marchenko ; $(MAKE) install
cd corrvir ; $(MAKE) install
+ cd raytime ; $(MAKE) install
mkdirs:
-mkdir -p lib
@@ -18,6 +19,7 @@ clean:
cd utils ; $(MAKE) $@
cd marchenko ; $(MAKE) $@
cd corrvir ; $(MAKE) $@
+ cd raytime ; $(MAKE) $@
realclean:
cd FFTlib ; $(MAKE) $@
@@ -25,6 +27,7 @@ realclean:
cd utils ; $(MAKE) $@
cd marchenko ; $(MAKE) $@
cd corrvir ; $(MAKE) $@
+ cd raytime ; $(MAKE) $@
rm -f lib/*
rm -f include/*
rm -f bin/*
diff --git a/fdelmodc/.DS_Store b/fdelmodc/.DS_Store
index f32ee3de07f0d73c742fdadceb960e8afa6cc66c..af8b7c7cde37a0dbad7481f9fa0c1c7ee26dcb31 100644
Binary files a/fdelmodc/.DS_Store and b/fdelmodc/.DS_Store differ
diff --git a/fdelmodc/demo/fdelmodc_visco.scr b/fdelmodc/demo/fdelmodc_visco.scr
index f43ec8dfe1c59e82774a4609ef3a4da201681ca6..ecdcbb7ec691c5c3a7e99a6714c6f707f77dd234 100755
--- a/fdelmodc/demo/fdelmodc_visco.scr
+++ b/fdelmodc/demo/fdelmodc_visco.scr
@@ -37,6 +37,7 @@ export filero=model_ro.su
export fileqp=relax_cp.su
export fileqs=relax_cs.su
+export OMP_NUM_THREADS=4
../fdelmodc \
file_cp=$filecp file_cs=$filecs file_den=$filero \
diff --git a/fdelmodc/fdelmodc.c b/fdelmodc/fdelmodc.c
index de6a1f5ab5bd4edf3a2e036b5c88d1e1d0a3f4ad..ae1e91baa54c5ba4eece610286a1c13629ba7024 100644
--- a/fdelmodc/fdelmodc.c
+++ b/fdelmodc/fdelmodc.c
@@ -40,9 +40,7 @@ int acoustic2(modPar mod, srcPar src, wavPar wav, bndPar bnd, int itime, int ixs
int acoustic4Block(modPar mod, srcPar src, wavPar wav, bndPar bnd, int itime, int ixsrc, int izsrc, float **src_nwav, float *vx,
float *vz, float *p, float *rox, float *roz, float *l2m, int verbose);
-
-int viscoacoustic4(modPar mod, srcPar src, wavPar wav, bndPar bnd, int itime, int ixsrc, int izsrc, float **src_nwav, float *vx, float
-*vz, float *p, float *rox, float *roz, float *l2m, float *tss, float *tep, float *q, int verbose);
+int viscoacoustic4(modPar mod, srcPar src, wavPar wav, bndPar bnd, int itime, int ixsrc, int izsrc, float **src_nwav, float *vx, float *vz, float *p, float *rox, float *roz, float *l2m, float *tss, float *tep, float *q, int verbose);
int elastic4(modPar mod, srcPar src, wavPar wav, bndPar bnd, int itime, int ixsrc, int izsrc, float **src_nwav, float *vx, float *vz, float *tzz, float *txx, float *txz, float *rox, float *roz, float *l2m, float *lam, float *mul, int verbose);
diff --git a/fdelmodc/viscoacoustic4.c b/fdelmodc/viscoacoustic4.c
index 91601cd3b8ada7a4e17b9be966a08f53c4b20e95..63207c7da09c060fccf4b3625a86e6437d744d91 100644
--- a/fdelmodc/viscoacoustic4.c
+++ b/fdelmodc/viscoacoustic4.c
@@ -112,14 +112,13 @@ int viscoacoustic4(modPar mod, srcPar src, wavPar wav, bndPar bnd, int itime, in
boundariesP(mod, bnd, vx, vz, p, NULL, NULL, rox, roz, l2m, NULL, NULL, itime, verbose);
/* calculate p/tzz for all grid points except on the virtual boundary */
+#pragma omp for private (iz,ix, Tpp) nowait schedule(guided,1)
for (ix=mod.ioPx; ix<mod.iePx; ix++) {
-#pragma omp for private (iz) nowait schedule(guided,1)
#pragma ivdep
for (iz=mod.ioPz; iz<mod.iePz; iz++) {
dxvx[iz] = c1*(vx[(ix+1)*n1+iz] - vx[ix*n1+iz]) +
c2*(vx[(ix+2)*n1+iz] - vx[(ix-1)*n1+iz]);
}
-#pragma omp for private (iz) nowait schedule(guided,1)
#pragma ivdep
for (iz=mod.ioPz; iz<mod.iePz; iz++) {
dzvz[iz] = c1*(vz[ix*n1+iz+1] - vz[ix*n1+iz]) +
@@ -127,14 +126,12 @@ int viscoacoustic4(modPar mod, srcPar src, wavPar wav, bndPar bnd, int itime, in
}
/* help variables to let the compiler vectorize the loops */
-#pragma omp for private (iz) nowait schedule(guided,1)
#pragma ivdep
for (iz=mod.ioPz; iz<mod.iePz; iz++) {
Tpp = tep[ix*n1+iz]*tss[ix*n1+iz];
Tlm[iz] = (1.0-Tpp)*tss[ix*n1+iz]*l2m[ix*n1+iz]*0.5;
Tlp[iz] = l2m[ix*n1+iz]*Tpp;
}
-#pragma omp for private (iz) schedule(guided,1)
#pragma ivdep
for (iz=mod.ioPz; iz<mod.iePz; iz++) {
Tt1[iz] = 1.0/(ddt+0.5*tss[ix*n1+iz]);
@@ -142,18 +139,15 @@ int viscoacoustic4(modPar mod, srcPar src, wavPar wav, bndPar bnd, int itime, in
}
/* the update with the relaxation correction */
-#pragma omp for private (iz) schedule(guided,1)
#pragma ivdep
for (iz=mod.ioPz; iz<mod.iePz; iz++) {
p[ix*n1+iz] -= Tlp[iz]*(dzvz[iz]+dxvx[iz]) + q[ix*n1+iz];
}
-#pragma omp for private (iz) schedule(guided,1)
#pragma ivdep
for (iz=mod.ioPz; iz<