Merge branch 'master' of https://github.com/JanThorbecke/OpenSource

updates

marchenko_applications/Makefile

@@ -49,6 +49,8 @@ SRCH	= marchenko.c \
 		writeSrcRecPos.c \
 		writesufile.c \
 		gaussGen.c \
+		iterations.c \
+		imaging.c \
 		threadAffinity.c
 
 OBJJ	= $(SRCJ:%.c=%.o)

marchenko_applications/raytime.c

@@ -175,7 +175,7 @@ int raytime(float *time, float *ampl, int *xnx, float *xrcv, float *xsrc, float
         	coordsx.z = mod.z0+shot.z[izshot]*mod.dz;
         	coordsx.y = 0;
 
-			xnx[(izshot*shot.nx)+ixshot]  = rec.n;
+			xnx[ (izshot*shot.nx)+ixshot] = rec.n;
             xsrc[(izshot*shot.nx)+ixshot] = mod.x0+mod.dx*shot.x[ixshot];
             zsrc[(izshot*shot.nx)+ixshot] = mod.z0+mod.dz*shot.z[izshot];
 

marchenko_full/Makefile

@@ -3,7 +3,7 @@
 include ../Make_include
 
 LIBS    += -L$L -lgenfft -lm $(LIBSM)
-#OPTC += -g -O0 -Wall 
+OPTC += -g -O0 -Wall 
 
 #ALL: fmute marchenko marchenko2
 

marchenko_full/marchenko.c

@@ -308,7 +308,7 @@ int main (int argc, char **argv)
 	}
 	else if (file_ray==NULL && file_tinv==NULL) {
 		getParameters(&mod, &rec, &src, &shot, &ray, verbose);
-		n1 = rec.nt;
+		n1 = 1;
 		n2 = rec.n;
 		ngath = shot.n;
 		d1 = mod.dt;