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

marchenko/Makefile

@@ -7,7 +7,7 @@ include ../Make_include
 #OPTC += -g -traceback #-check-pointers=rw -check-pointers-undimensioned
 
 
-ALL: fmute marchenko marchenko_primaries marchenko_tshift
+ALL: fmute marchenko marchenko_primaries 
 
 SRCJ	= fmute.c \
 		getFileInfo.c  \
@@ -63,11 +63,6 @@ OBJH	= $(SRCH:%.c=%.o)
 marchenko:	$(OBJH) 
 	$(CC) $(LDFLAGS) $(OPTC) $(CFLAGS) -o marchenko $(OBJH) $(LIBS)
 
-OBJT	= $(SRCT:%.c=%.o)
-
-marchenko_tshift:	$(OBJT) 
-	$(CC) $(LDFLAGS) $(OPTC) $(CFLAGS) -o marchenko_tshift $(OBJT) $(LIBS)
-
 OBJP	= $(SRCP:%.c=%.o)
 
 marchenko_primaries:	$(OBJP) 

marchenko/demo/oneD/primaries.scr

@@ -19,7 +19,7 @@ select=451
 
 makewave fp=20 dt=0.004 file_out=wave.su nt=2048 t0=0.0 scale=0 scfft=1
 
-../../marchenko_primaries1 file_shot=$R ishot=$select file_src=wave.su \
+../../marchenko_primaries file_shot=$R ishot=$select file_src=wave.su \
 	nshots=901 verbose=2 istart=40 iend=500 fmax=90 pad=1024 \
 	niter=31 shift=20 smooth=10 niterec=2 niterskip=50 file_rr=pred_rr.su T=0 file_update=update.su