diff --git a/marchenko/demo/WS15/README.1 b/marchenko/demo/WS15/README.1
index a758b3464fef4a35c8ce9ce25bd96e0fba45f91a..dcc4e80c872e44bf38dde9b205c336a03a2475fe 100644
--- a/marchenko/demo/WS15/README.1
+++ b/marchenko/demo/WS15/README.1
@@ -16,6 +16,10 @@ export PATH=.:$CWPROOT/bin:/lus/scratch/$USER/OpenSource/bin:$PATH:
-d- Get the Marchenko software (and other utilities modeling code))
git clone https://github.com/JanThorbecke/OpenSource.git
+
+if the git clone takes too much time you can copy the source code:
+
+cp -rp /lus/snx11029/jan/OpenSource /lus/scratch/$USER/
*2* after the set-up the code can be compiled
@@ -33,21 +37,23 @@ After succesfull complication the code can be used for running the exercises and
To run example jobs must be submitted to the Workload Manager PBSpro.
An example script can be found on:
-/home/users/jan/WS15/job.pbs
+/lus/scratch/$USER/OpenSource/WS15/job.pbs
-in job.pbs leave the number of nodes set to 1, the code is not MPI parallel and cannot use more than 1 node. The number of OMP_NUM_THREADS can be changed and is currently set to 40.
+in job.pbs leave the number of nodes set to 1; the code is not MPI parallel and cannot use more than 1 node. The number of OMP_NUM_THREADS can be changed and is currently set to 40.
Add the ...scr command (that can be found in the demo directories) as the last line in the aprun command line and submit the job to the queue with 'qsub job.pbs'
+you can check the status of your job in the queue with 'qstat'
+
*4* Display of results:
suximage < result.su perc=99 &
-if X11 display 1s too slow:
+if X11 display is too slow:
supsimage < result.su perc=99 > results.eps
convert results.eps ~/results.png
-copy png file to local machine
+copy png file to your laptop you are working on
scp trxx@swan.cray.com:~/*png .
diff --git a/marchenko/demo/WS15/README.2 b/marchenko/demo/WS15/README.2
index fa4b28fc55974907c239351736d1368bdf4172ed..aa9603a8f39ff8773bbfd22d07e2a8b03efda6f3 100644
--- a/marchenko/demo/WS15/README.2
+++ b/marchenko/demo/WS15/README.2
@@ -13,13 +13,21 @@ Compute the intial focusing operator placed at a depth of 1100 m by running
initialFocus.scr
-and run the marchenko program
+To compare the Green's function computed by marchenko generate the reference output
+
+adapt job.pbs to run referenceShot.scr
+
+run the marchenko program interactively (no need to submit job to queue);
-marchenko.scr
+./marchenko.scr
Compare the Green's function computed by marchenko with the reference (adapt job.pbs to run referenceShot.scr)
+The script eps.scr generate .eps files and .png files that can be copied back to your local laptop for display.
+
You can experiment with
+-amplitude of R: scale with a constant ampltiude
+-investigate the wavelet that is used to model R
-number of iterations,
-intial focusing position,
-investigate at intermediate results (see ../oneD/marchenkoIter.scr as an example).
diff --git a/marchenko/demo/twoD/initialFocus.scr b/marchenko/demo/twoD/initialFocus.scr
index ebf4f4bd9c4aafe7d4d0149656c5bbff036ae213..fcc72f51099edf986a557647b32e95d0dce6fcb4 100755
--- a/marchenko/demo/twoD/initialFocus.scr
+++ b/marchenko/demo/twoD/initialFocus.scr
@@ -29,7 +29,7 @@ do
(( xsrc = -3000 + ${ishot}*${dxshot} ))
echo xsrc=$xsrc
- file_rcv=shots/iniFocus_z1100_x${xsrc}.su
+ file_rcv=iniFocus_z1100_x${xsrc}.su
fdelmodc \
file_cp=synclDown_cp.su ischeme=1 iorder=4 \
diff --git a/marchenko/demo/twoD/marchenko.scr b/marchenko/demo/twoD/marchenko.scr
index 24131122208386b9ce51a263e9902c84ae5da060..88827395a712e353357876737b1c24bb2646b9f7 100755
--- a/marchenko/demo/twoD/marchenko.scr
+++ b/marchenko/demo/twoD/marchenko.scr
@@ -5,15 +5,15 @@ export PATH=$HOME/src/OpenSource/bin:$PATH:
export OMP_NUM_THREADS=40
#mute all events below the first arrival to get the intial focusing field
-fmute file_shot=shots/iniFocus_z1100_x0_rp.su file_out=p0plus.su above=-1 shift=-10 verbose=1 check=1 hw=4
+fmute file_shot=iniFocus_z1100_x0_rp.su file_out=p0plus.su above=-1 shift=-10 verbose=1 check=1 hw=4
#apply the Marchenko algorithm
-../../marchenko file_shot=shots/refl_rp.su file_tinv=p0plus.su nshots=601 verbose=1 \
- tap=0 niter=15 hw=8 shift=7 smooth=3 \
- file_green=pgreen2.su file_gplus=Gplus0.su file_gmin=Gmin0.su \
+marchenko file_shot=shots/refl_rp.su file_tinv=p0plus.su nshots=601 verbose=1 \
+ tap=0 niter=15 hw=8 shift=7 smooth=3 \
+ file_green=pgreen.su file_gplus=Gplus0.su file_gmin=Gmin0.su \
file_f1plus=f1plus0.su file_f1min=f1min0.su file_f2=f2.su
-#compare Green's funtions on Marhcenko and reference result
+#compare Green's funtions between Marchenko and reference result
suwind key=gx min=0 max=0 itmax=511 < pgreen.su | sumax mode=abs outpar=nepmg
suwind key=gx min=0 max=0 itmax=511 < referenceP_rp.su | sumax mode=abs outpar=neprf
mg=`cat nepmg | awk '{print $1}'`
diff --git a/marchenko/demo/twoD/primaries.scr b/marchenko/demo/twoD/primaries.scr
index 7ec27e0c712832d720e734493f8cbc397f73a645..d001b743b833a14ad141e024d9be64a56c504b29 100755
--- a/marchenko/demo/twoD/primaries.scr
+++ b/marchenko/demo/twoD/primaries.scr
@@ -15,14 +15,14 @@ export OMP_NUM_THREADS=40
select=301
makewave fp=20 dt=0.004 file_out=wave.su nt=1024 t0=0.0 scale=0 scfft=1
-suwind key=fldr min=$select max=$select < shots/refl_rp.su > shotsx0.su
-fconv file_in1=shotsx0.su file_in2=wave.su file_out=shotw.su
marchenko_primaries file_shot=shots/refl_rp.su ishot=$select file_src=wave.su \
nshots=601 verbose=2 istart=40 iend=650 fmax=90 \
niter=22 niterskip=50 shift=20 file_rr=pred_rr.su T=0
#alternative use shotw as input, must first be multiplied by -1 (see theory)
+#suwind key=fldr min=$select max=$select < shots/refl_rp.su > shotsx0.su
+#fconv file_in1=shotsx0.su file_in2=wave.su file_out=shotw.su
#sugain scale=-1 < shotw.su > pplus.su
#
#marchenko_primaries file_shot=shots/refl_rp.su file_tinv=pplus.su \
diff --git a/marchenko/demo/twoD/referenceShot.scr b/marchenko/demo/twoD/referenceShot.scr
index 4c015f6baa98c092e3210801e3a6caff68fd34ad..abd00a179eb84fca06d2d7aefed28e2847dcb1de 100755
--- a/marchenko/demo/twoD/referenceShot.scr
+++ b/marchenko/demo/twoD/referenceShot.scr
@@ -9,7 +9,7 @@ dt=0.0005
makewave fp=20 dt=$dt file_out=wave.su nt=4096 t0=0.1 scale=1
-export OMP_NUM_THREADS=8
+export OMP_NUM_THREADS=12
fdelmodc \
file_cp=syncl_cp.su ischeme=1 iorder=4 \
@@ -17,21 +17,21 @@ fdelmodc \
file_src=wave.su \
file_rcv=referenceP.su \
src_type=1 \
- src_orient=1 \
- src_injectionrate=1 \
+ src_orient=1 \
+ src_injectionrate=1 \
rec_type_ud=1 \
rec_type_p=1 \
rec_int_vz=2 \
dtrcv=0.004 \
- rec_delay=0.1 \
+ rec_delay=0.1 \
verbose=2 \
tmod=2.144 \
dxrcv=10.0 \
xrcv1=-3000 xrcv2=3000 \
zrcv1=0 zrcv2=0 \
xsrc=0 zsrc=1100 \
- file_snap=backpropref.su tsnap1=0.1 dtsnap=0.010 tsnap2=2.100 \
- dxsnap=10 dzsnap=10 zsnap1=0 zsnap2=2000 xsnap1=-2250 xsnap2=2250 sna_type_vz=0 \
+ file_snap=backpropref.su tsnap1=0.1 dtsnap=0.010 tsnap2=2.100 \
+ dxsnap=10 dzsnap=10 zsnap1=0 zsnap2=2000 xsnap1=-2250 xsnap2=2250 sna_type_vz=0 \
ntaper=200 \
left=2 right=2 top=2 bottom=2