tUpdate program invocations and plotting to reflect option and output change - cngf-pf-exp1 - experiments for first paper with continuum granular model
 (HTM) git clone git://src.adamsgaard.dk/manus_continuum_granular1_exp
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 8d540b852f0877ccc0cdd3ffd2aa187dad1ed993
 (DIR) parent f08311efbe3f5173a4021fecfd95a650e1f43b0b
 (HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
       Date:   Thu,  5 Mar 2020 22:02:16 +0100
       
       Update program invocations and plotting to reflect option and output change
       
       Diffstat:
         M fig-mohr_coulomb/Makefile           |      20 ++++++++++----------
         M fig-mohr_coulomb/fig.gp             |       8 ++++----
         M fig-parameter_test/Makefile         |     108 ++++++++++++++++----------------
         M fig-pulse_lag/Makefile              |      26 +++++++++++++-------------
         M fig-pulse_square/Makefile           |      26 +++++++++++++-------------
         M fig-pulse_triangle/Makefile         |      26 +++++++++++++-------------
         M fig-rate_dependence/Makefile        |       2 +-
         M fig-rate_dependence/fig.gp          |       4 ++--
         M fig-skin_depth/Makefile             |      15 +++++++--------
         M fig-stick_slip_depth/Makefile       |      10 +++++-----
         M fig-stick_slip_depth/fig.gp         |       8 ++++----
         M fig-stick_slip_forcing/Makefile     |      20 ++++++++++----------
         M fig-stick_slip_rate/Makefile        |      22 +++++++++++-----------
         M fig-stick_slip_rate_depth/Makefile  |      10 +++++-----
         M fig-stick_slip_rate_depth/fig.gp    |       4 ++--
         M fig-stick_slip_rate_depth_local/Ma… |      10 +++++-----
         M fig-stick_slip_rate_local/Makefile  |      22 +++++++++++-----------
         M fig-stick_slip_stress/Makefile      |      20 ++++++++++----------
         M fig-stick_slip_stress_depth/Makefi… |      10 +++++-----
         M fig-strain_distribution/Makefile    |      16 +++++++++-------
         M fig-strain_distribution/fig.gp      |      10 +++++-----
         M fig-strain_distribution_local/Make… |      16 +++++++++-------
       
       22 files changed, 208 insertions(+), 205 deletions(-)
       ---
 (DIR) diff --git a/fig-mohr_coulomb/Makefile b/fig-mohr_coulomb/Makefile
       t@@ -10,8 +10,8 @@ mc_caesar.txt: $(BIN) Makefile
                rm -f $@
                for N in $(N_SEQ); do \
                        printf "$$N\t" >> $@; \
       -                ./$(BIN) -m 0.532 -f 0.532 -C -6.5e3 -P $$N -L 1.0 mc | \
       -                tail -n 1 | cut -f4 >> $@; \
       +                ./$(BIN) -f 0.532 -m 0.532 -c -6.5e3 -n $$N -L 1.0 mc | \
       +                tail -n 1 | cut -f5 >> $@; \
                done
        
        # Storglaciaren till (Iverson et al., 1998)
       t@@ -19,8 +19,8 @@ mc_storglaciaren.txt: $(BIN) Makefile
                rm -f $@
                for N in $(N_SEQ); do \
                        printf "$$N\t" >> $@; \
       -                ./$(BIN) -m 0.494 -f 0.494 -C 5.0e3 -P $$N -L 1.0 mc | \
       -                tail -n 1 | cut -f4 >> $@; \
       +                ./$(BIN) -f 0.494 -m 0.494 -c 5.0e3 -n $$N -L 1.0 mc | \
       +                tail -n 1 | cut -f5 >> $@; \
                done
        
        # Two Rivers till (Iversonet al., 1998)
       t@@ -28,8 +28,8 @@ mc_two_rivers.txt: $(BIN) Makefile
                rm -f $@
                for N in $(N_SEQ); do \
                        printf "$$N\t" >> $@; \
       -                ./$(BIN) -m 0.321 -f 0.321 -C 14e3 -P $$N -L 1.0 mc | \
       -                tail -n 1 | cut -f4 >> $@; \
       +                ./$(BIN) -f 0.321 -m 0.321 -c 14e3 -n $$N -L 1.0 mc | \
       +                tail -n 1 | cut -f5 >> $@; \
                done
        
        # Des Moines Lobe till (Iverson et al., 2010)
       t@@ -37,8 +37,8 @@ mc_des_moines_lobe.txt: $(BIN) Makefile
                rm -f $@
                for N in $(N_SEQ); do \
                        printf "$$N\t" >> $@; \
       -                ./$(BIN) -m 0.327 -f 0.327 -C 4.23e3 -P $$N -L 1.0 mc | \
       -                tail -n 1 | cut -f4 >> $@; \
       +                ./$(BIN) -f 0.327 -n 0.327 -c 4.23e3 -n $$N -L 1.0 mc | \
       +                tail -n 1 | cut -f5 >> $@; \
                done
        
        # WIS till (Tulaczyk et al., 2001)
       t@@ -46,8 +46,8 @@ mc_wis.txt: $(BIN) Makefile
                rm -f $@
                for N in $(N_SEQ); do \
                        printf "$$N\t" >> $@; \
       -                ./$(BIN) -m 0.445 -f 0.445 -C 3.0e3 -P $$N -L 1.0 mc | \
       -                tail -n 1 | cut -f4 >> $@; \
       +                ./$(BIN) -f 0.445 -n 0.445 -c 3.0e3 -n $$N -L 1.0 mc | \
       +                tail -n 1 | cut -f5 >> $@; \
                done
        
        ../$(FIG).pdf: fig.gp mc_caesar.txt mc_storglaciaren.txt mc_two_rivers.txt mc_des_moines_lobe.txt mc_wis.txt *.dat
 (DIR) diff --git a/fig-mohr_coulomb/fig.gp b/fig-mohr_coulomb/fig.gp
       t@@ -33,10 +33,10 @@ set label "C" at screen 0.05,0.95 font ",12"
        
        plot \
                caesar(x)                w l lc "#56b4e9" lw 2 t "Caesar till", \
       -        "mc_caesar.txt"          u ($1):($2*$1 - 6.5) w l dashtype 2 lc "#8cc7e9" lw 2 t "{/:Bold Model}", \
       +        "mc_caesar.txt"          u ($1):($2*$1 - 6.5) w l dashtype 2 lc "#8cc7e9" lw 2 t "{/:Bold CNGF-PF}", \
                storglaciaren(x)         w l lc "#e69f00" lw 2 t "Storglaciaren till", \
       -        "mc_storglaciaren.txt"   u ($1):($2*$1 + 5) w l dashtype 2 lc "#e6c272" lw 2 t "{/:Bold Model}", \
       +        "mc_storglaciaren.txt"   u ($1):($2*$1 + 5) w l dashtype 2 lc "#e6c272" lw 2 t "{/:Bold CNGF-PF}", \
                two_rivers(x)            w l lc "#f0e442" lw 2 t "Two Rivers till", \
       -        "mc_two_rivers.txt"      u ($1):($2*$1 + 14) w l dashtype 2 lc "#f0eaa0" lw 2 t "{/:Bold Model}", \
       +        "mc_two_rivers.txt"      u ($1):($2*$1 + 14) w l dashtype 2 lc "#f0eaa0" lw 2 t "{/:Bold CNGF-PF}", \
                wis(x)                   w l lc "#0072b2" lw 2 t "WIS till", \
       -        "mc_wis.txt"             u ($1):($2*$1 + 3) w l dashtype 2 lc "#5992b2" lw 2 t "{/:Bold Model}"
       +        "mc_wis.txt"             u ($1):($2*$1 + 3) w l dashtype 2 lc "#5992b2" lw 2 t "{/:Bold CNGF-PF}"
 (DIR) diff --git a/fig-parameter_test/Makefile b/fig-parameter_test/Makefile
       t@@ -19,16 +19,16 @@ d.txt: $(BIN)
                for d in 1e-4 2e-4 4e-4 1e-3 2e-3 4e-3 1e-2 2e-2; do \
                        printf "$$d\t" >> $@; \
                        ./$(BIN) \
       -                        --length $(LENGTH) \
       -                        --set-shear-velocity $(SHEAR_VEL) \
       -                        --normal-stress $(NORMAL_STRESS) \
       -                        --cohesion $(COHESION) \
       -                        --nonlocal-amplitude $(AMPL) \
       -                        --rate-dependence $(BRATE) \
       -                        --friction-coefficient $(MU_S) \
       -                        --grain-size $$d \
       +                        -L $(LENGTH) \
       +                        -s $(SHEAR_VEL) \
       +                        -n $(NORMAL_STRESS) \
       +                        -c $(COHESION) \
       +                        -A $(AMPL) \
       +                        -b $(BRATE) \
       +                        -m $(MU_S) \
       +                        -d $$d \
                                d.$$d \
       -                        | tail -n 1 | cut -f4 >> $@; \
       +                        | tail -n 1 | cut -f5 >> $@; \
                done'
        
        mu_s.txt: $(BIN)
       t@@ -37,16 +37,16 @@ mu_s.txt: $(BIN)
                for mu_s in $$(seq 0.20 0.05 0.70); do \
                        printf "$$mu_s\t" >> $@; \
                        ./$(BIN) \
       -                        --length $(LENGTH) \
       -                        --set-shear-velocity $(SHEAR_VEL) \
       -                        --normal-stress $(NORMAL_STRESS) \
       -                        --cohesion $(COHESION) \
       -                        --nonlocal-amplitude $(AMPL) \
       -                        --rate-dependence $(BRATE) \
       -                        --friction-coefficient $$mu_s \
       -                        --grain-size $(DIAMETER) \
       +                        -L $(LENGTH) \
       +                        -s $(SHEAR_VEL) \
       +                        -n $(NORMAL_STRESS) \
       +                        -c $(COHESION) \
       +                        -A $(AMPL) \
       +                        -b $(BRATE) \
       +                        -m $$mu_s \
       +                        -d $(DIAMETER) \
                                mu_s.$$mu_s \
       -                        | tail -n 1 | cut -f4 >> $@; \
       +                        | tail -n 1 | cut -f5 >> $@; \
                done'
        
        C.txt: $(BIN)
       t@@ -55,16 +55,16 @@ C.txt: $(BIN)
                for C in 0.0 5e3 10e3 15e3 20e3 25e3 30e3; do \
                        printf "$$C\t" >> $@; \
                        ./$(BIN) \
       -                        --length $(LENGTH) \
       -                        --set-shear-velocity $(SHEAR_VEL) \
       -                        --normal-stress $(NORMAL_STRESS) \
       -                        --cohesion $$C \
       -                        --nonlocal-amplitude $(AMPL) \
       -                        --rate-dependence $(BRATE) \
       -                        --friction-coefficient $(MU_S) \
       -                        --grain-size $(DIAMETER) \
       +                        -L $(LENGTH) \
       +                        -s $(SHEAR_VEL) \
       +                        -n $(NORMAL_STRESS) \
       +                        -c $$C \
       +                        -A $(AMPL) \
       +                        -b $(BRATE) \
       +                        -m $(MU_S) \
       +                        -d $(DIAMETER) \
                                C.$$C \
       -                        | tail -n 1 | cut -f4 >> $@; \
       +                        | tail -n 1 | cut -f5 >> $@; \
                done'
        
        A.txt: $(BIN)
       t@@ -73,16 +73,16 @@ A.txt: $(BIN)
                for A in 1e-10 $$(seq 0.1 0.10 1.00); do \
                        printf "$$A\t" >> $@; \
                        ./$(BIN) \
       -                        --length $(LENGTH) \
       -                        --set-shear-velocity $(SHEAR_VEL) \
       -                        --normal-stress $(NORMAL_STRESS) \
       -                        --cohesion $(COHESION) \
       -                        --nonlocal-amplitude $$A \
       -                        --rate-dependence $(BRATE) \
       -                        --friction-coefficient $(MU_S) \
       -                        --grain-size $(DIAMETER) \
       +                        -L $(LENGTH) \
       +                        -s $(SHEAR_VEL) \
       +                        -n $(NORMAL_STRESS) \
       +                        -c $(COHESION) \
       +                        -A $$A \
       +                        -b $(BRATE) \
       +                        -m $(MU_S) \
       +                        -d $(DIAMETER) \
                                A.$$A \
       -                        | tail -n 1 | cut -f4 >> $@; \
       +                        | tail -n 1 | cut -f5 >> $@; \
                done'
        
        b.txt: $(BIN)
       t@@ -91,16 +91,16 @@ b.txt: $(BIN)
                for b in $$(seq 0.1 0.1 0.9); do \
                        printf "$$b\t" >> $@; \
                        ./$(BIN) \
       -                        --length $(LENGTH) \
       -                        --set-shear-velocity $(SHEAR_VEL) \
       -                        --normal-stress $(NORMAL_STRESS) \
       -                        --cohesion $(COHESION) \
       -                        --nonlocal-amplitude $(AMPL) \
       -                        --rate-dependence $$b \
       -                        --friction-coefficient $(MU_S) \
       -                        --grain-size $(DIAMETER) \
       +                        -L $(LENGTH) \
       +                        -s $(SHEAR_VEL) \
       +                        -n $(NORMAL_STRESS) \
       +                        -c $(COHESION) \
       +                        -A $(AMPL) \
       +                        -b $$b \
       +                        -m $(MU_S) \
       +                        -d $(DIAMETER) \
                                b.$$b \
       -                        | tail -n 1 | cut -f4 >> $@; \
       +                        | tail -n 1 | cut -f5 >> $@; \
                done'
        
        L_z.txt: $(BIN)
       t@@ -109,16 +109,16 @@ L_z.txt: $(BIN)
                for L_z in 0.002 0.004 0.008 0.01 0.015 0.02 0.04 0.06 0.08 0.10 0.15 0.20 0.25 0.30 0.40 0.50 0.60 0.70 0.75 0.80 0.90 1.0; do \
                        printf "$$L_z\t" >> $@; \
                        ./$(BIN) \
       -                        --length $$L_z \
       -                        --set-shear-velocity $(SHEAR_VEL) \
       -                        --normal-stress $(NORMAL_STRESS) \
       -                        --cohesion $(COHESION) \
       -                        --nonlocal-amplitude $(AMPL) \
       -                        --rate-dependence $(BRATE) \
       -                        --friction-coefficient $(MU_S) \
       -                        --grain-size $(DIAMETER) \
       +                        -L $$L_z \
       +                        -s $(SHEAR_VEL) \
       +                        -n $(NORMAL_STRESS) \
       +                        -c $(COHESION) \
       +                        -A $(AMPL) \
       +                        -b $(BRATE) \
       +                        -m $(MU_S) \
       +                        -d $(DIAMETER) \
                                L_z.$$L_z \
       -                        | tail -n 1 | cut -f4 >> $@; \
       +                        | tail -n 1 | cut -f5 >> $@; \
                done'
        
        
 (DIR) diff --git a/fig-pulse_lag/Makefile b/fig-pulse_lag/Makefile
       t@@ -7,19 +7,19 @@ PERM_SEQ=3.16e-16 1e-16 3.16e-17 1e-17 3.16e-18 1e-18 3.16e-19 1e-19
        
        sim-1e-18.output00000.txt: $(BIN)
                /bin/sh -c 'for perm in $(PERM_SEQ); do \
       -        ./$(BIN) --length 8.0 \
       -        --normal-stress 200e3 \
       -        --set-shear-velocity $$( echo "10000/(365*24*60*60)" | bc -l ) \
       -        --fluid \
       -        --fluid-permeability $$perm \
       -        --fluid-pressure-top 0.0 \
       -        --fluid-pressure-ampl 180e3 \
       -        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
       -        --fluid-pressure-pulse-time $$( echo "2*3600*24" | bc -l ) \
       -        --fluid-pressure-pulse-shape triangle \
       -        --file-interval $$( echo "60*10" | bc -l ) \
       -        --time 0.0 \
       -        --time-end $$( echo "20*3600*24 + 60*10" | bc -l ) sim-$$perm; done'
       +        ./$(BIN) -L 8.0 \
       +        -n 200e3 \
       +        -s $$( echo "10000/(365*24*60*60)" | bc -l ) \
       +        -F \
       +        -k $$perm \
       +        -O 0.0 \
       +        -a 180e3 \
       +        -q $$( echo "1.0/(3600*24)" | bc -l ) \
       +        -u $$( echo "2*3600*24" | bc -l ) \
       +        -S triangle \
       +        -I $$( echo "60*10" | bc -l ) \
       +        -t 0.0 \
       +        -e $$( echo "20*3600*24 + 60*10" | bc -l ) sim-$$perm; done'
        
        timeseries.txt: sim-1e-18.output00000.txt
                /bin/sh -c '\
 (DIR) diff --git a/fig-pulse_square/Makefile b/fig-pulse_square/Makefile
       t@@ -7,19 +7,19 @@ PF_SEQ=1 2 3 4 5 6 7 8 9
        
        sim-4.output00000.txt: $(BIN) Makefile
                /bin/sh -c 'for i in $(PF_SEQ); do \
       -        ./$(BIN) --length 8.0 \
       -        --normal-stress 200e3 \
       -        --set-shear-velocity $$( echo "10000/(365*24*60*60)" | bc -l ) \
       -        --fluid \
       -        --fluid-permeability 2e-17 \
       -        --fluid-pressure-top 0.0 \
       -        --fluid-pressure-ampl "$$( echo "2*$$i" | bc -l )0e3" \
       -        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
       -        --fluid-pressure-pulse-time $$( echo "$$i*3600*24" | bc -l ) \
       -        --fluid-pressure-pulse-shape square \
       -        --file-interval $$( echo "60*10" | bc -l ) \
       -        --time $$( echo "($$i-1)*3600*24" | bc -l ) \
       -        --time-end $$( echo "($$i+1)*3600*24*1.5" | bc -l ) sim-$$i; done'
       +        ./$(BIN) -L 8.0 \
       +        -n 200e3 \
       +        -s $$( echo "10000/(365*24*60*60)" | bc -l ) \
       +        -F \
       +        -k 2e-17 \
       +        -O 0.0 \
       +        -a "$$( echo "2*$$i" | bc -l )0e3" \
       +        -q $$( echo "1.0/(3600*24)" | bc -l ) \
       +        -u $$( echo "$$i*3600*24" | bc -l ) \
       +        -S square \
       +        -I $$( echo "60*10" | bc -l ) \
       +        -t $$( echo "($$i-1)*3600*24" | bc -l ) \
       +        -e $$( echo "($$i+1)*3600*24*1.5" | bc -l ) sim-$$i; done'
        
        timeseries.txt: sim-4.output00000.txt
                /bin/sh -c '\
 (DIR) diff --git a/fig-pulse_triangle/Makefile b/fig-pulse_triangle/Makefile
       t@@ -7,19 +7,19 @@ PF_SEQ=1 2 3 4 5 6 7 8 9
        
        sim-4.output00000.txt: $(BIN) Makefile
                /bin/sh -c 'for i in $(PF_SEQ); do \
       -        ./$(BIN) --length 8.0 \
       -        --normal-stress 200e3 \
       -        --set-shear-velocity $$( echo "10000/(365*24*60*60)" | bc -l ) \
       -        --fluid \
       -        --fluid-permeability 2e-17 \
       -        --fluid-pressure-top 0.0 \
       -        --fluid-pressure-ampl "$$( echo "2*$$i" | bc -l )0e3" \
       -        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
       -        --fluid-pressure-pulse-time $$( echo "$$i*3600*24" | bc -l ) \
       -        --fluid-pressure-pulse-shape triangle \
       -        --file-interval $$( echo "60*10" | bc -l ) \
       -        --time $$( echo "($$i-1)*3600*24" | bc -l ) \
       -        --time-end $$( echo "($$i+1)*3600*24*1.5" | bc -l ) sim-$$i; done'
       +        ./$(BIN) -L 8.0 \
       +        -n 200e3 \
       +        -s $$( echo "10000/(365*24*60*60)" | bc -l ) \
       +        -F \
       +        -k 2e-17 \
       +        -O 0.0 \
       +        -a "$$( echo "2*$$i" | bc -l )0e3" \
       +        -q $$( echo "1.0/(3600*24)" | bc -l ) \
       +        -u $$( echo "$$i*3600*24" | bc -l ) \
       +        -S triangle \
       +        -I $$( echo "60*10" | bc -l ) \
       +        -t $$( echo "($$i-1)*3600*24" | bc -l ) \
       +        -e $$( echo "($$i+1)*3600*24*1.5" | bc -l ) sim-$$i; done'
        
        timeseries.txt: sim-4.output00000.txt
                /bin/sh -c '\
 (DIR) diff --git a/fig-rate_dependence/Makefile b/fig-rate_dependence/Makefile
       t@@ -13,7 +13,7 @@ sim.output00000.txt: $(BIN) Makefile
                        rm -f "$$out"; \
                        for t in $$(seq 0.0001 0.002 1.0); do \
                                printf "$$t\t" >> "$$out"; \
       -                        ./$(BIN) -f 0.5 -P 100e3 -L 1.0 --stress-ratio $$t -b $$b sim | \
       +                        ./$(BIN) -m 0.5 -n 100e3 -L 1.0 -f $$t -b $$b sim | \
                                tail -n 1 | cut -f2 >> "$$out"; \
                done; done'
        
 (DIR) diff --git a/fig-rate_dependence/fig.gp b/fig-rate_dependence/fig.gp
       t@@ -31,8 +31,8 @@ plot \
                "storglaciaren.dat"   w l lw 2 t "Storglaciaren till", \
                "two_rivers.dat"      w l lw 2 t "Two Rivers till", \
                "wis.dat"             w l lw 2 t "WIS till", \
       -        "out_b0.94.txt" u ($2*3600*24*365):1 w l lc '#666666' lw 2 dashtype 2 t "{/:Bold Model}, b = 0.94", \
       -        "out_b0.10.txt" u ($2*3600*24*365):1 w l lc '#666666' lw 2 dashtype 3 t "{/:Bold Model}, b = 0.10"
       +        "out_b0.94.txt" u ($2*3600*24*365):1 w l lc '#666666' lw 2 dashtype 2 t "{/:Bold CNGF-PF}, b = 0.94", \
       +        "out_b0.10.txt" u ($2*3600*24*365):1 w l lc '#666666' lw 2 dashtype 3 t "{/:Bold CNGF-PF}, b = 0.10"
        
        #set key bottom right font ",10" samplen 2.0
        #load 'BlueSeq.plt'
 (DIR) diff --git a/fig-skin_depth/Makefile b/fig-skin_depth/Makefile
       t@@ -27,14 +27,13 @@ max_depth_ampl10e3.txt: $(BIN) Makefile
                                        1e-3; do\
                                        printf "%g\t%g\t" $$f $$k >> $$out;\
                                        ./$(BIN) \
       -                                        --porosity 0.25 \
       -                                        --fluid-compressibility 3.9e-10 \
       -                                        --fluid-viscosity 1.787e-3 \
       -                                        --fluid-permeability $$k \
       -                                        --normal-stress 200e3 \
       -                                        --fluid-pressure-top 100e3 \
       -                                        --fluid-pressure-ampl $$A_f \
       -                                        --fluid-pressure-freq $$f | \
       +                                        -p 0.25 \
       +                                        -C 3.9e-10 \
       +                                        -i 1.787e-3 \
       +                                        -k $$k \
       +                                        -O 100e3 \
       +                                        -a $$A_f \
       +                                        -q $$f | \
                                                awk '{print $$1}' >> $$out;\
                                done;\
                                echo >> $$out;\
 (DIR) diff --git a/fig-stick_slip_depth/Makefile b/fig-stick_slip_depth/Makefile
       t@@ -14,11 +14,11 @@ stress/sim.output00001.txt: ../fig-stick_slip_stress/sim.output00001.txt
        ../$(FIG).pdf: fig.gp rate/sim.output00001.txt stress/sim.output00001.txt $(BIN) Makefile
                sh -c '\
                        out=$$($(BIN) \
       -                        --normal-stress 200e3 \
       -                        --fluid-permeability 2e-17 \
       -                        --fluid-pressure-top 100e3 \
       -                        --fluid-pressure-ampl 80e3 \
       -                        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l )\
       +                        -n 200e3 \
       +                        -k 2e-17 \
       +                        -O 100e3 \
       +                        -a 80e3 \
       +                        -q $$( echo "1.0/(3600*24)" | bc -l )\
                                ); \
                        max_def_depth=$$(echo $$out | cut -d" " -f1); \
                        skin_depth=$$(echo $$out | cut -d" " -f2); \
 (DIR) diff --git a/fig-stick_slip_depth/fig.gp b/fig-stick_slip_depth/fig.gp
       t@@ -50,7 +50,7 @@ set title "B" font ",11" offset -7,-0.6
        set xlabel "{/:Normal Eff. normal stress [kPa]}"
        plot for [t = t0:tend:inc] filename(t) u ($3/1e3):(L_z - $1):(t-t0) w l lc palette lw 1 t ""
        
       -set title "C (rate controlled)" font ",11" offset 0,-0.6
       +set title "C (speed controlled)" font ",11" offset 0,-0.6
        set xlabel "{/:Normal Shear speed [km/a]}"
        set ylabel ""
        unset ytics
       t@@ -63,7 +63,7 @@ set arrow from xmin,skin_depth to xmax,skin_depth nohead lc black front
        set arrow from xmin,max_def_depth to xmax,max_def_depth nohead front lc black dashtype 2
        plot for [t = t0:tend:inc] filename(t) u ($2*60*60*24*365/1000):(L_z - $1):(t-t0) w l lc palette lw 1 t ""
        
       -set title "D (rate controlled)" font ",11" offset 0,-0.6
       +set title "D (speed controlled)" font ",11" offset 0,-0.6
        set xlabel "{/:Normal Shear strain rate [1/d]}"
        set ylabel ""
        xmin = -2.0
       t@@ -88,7 +88,7 @@ xmax = 10
        set xrange [xmin:xmax]
        set xtics 2
        set arrow from xmin,skin_depth to xmax,skin_depth nohead lc black front
       -set arrow from xmin,max_def_depth to xmax,max_def_depth nohead front lc black dashtype 2
       +#set arrow from xmin,max_def_depth to xmax,max_def_depth nohead front lc black dashtype 2
        plot for [t = t0:tend:inc] filename(t) u ($2*60*60*24/1000):(L_z - $1):(t-t0) w l lc palette lw 1 t ""
        
        unset arrow
       t@@ -99,7 +99,7 @@ xmin = -1.0
        xmax = 12.0
        set xrange [xmin:xmax]
        set arrow from xmin,skin_depth to xmax,skin_depth nohead lc black front
       -set arrow from xmin,max_def_depth to xmax,max_def_depth nohead front lc black dashtype 2
       +#set arrow from xmin,max_def_depth to xmax,max_def_depth nohead front lc black dashtype 2
        unset ytics
        plot for [t = t0:tend:inc] filename(t) u ($6*60):(L_z - $1):(t-t0) w l lc palette lw 1 t ""
        unset format x
 (DIR) diff --git a/fig-stick_slip_forcing/Makefile b/fig-stick_slip_forcing/Makefile
       t@@ -5,16 +5,16 @@ default: ../$(FIG).pdf
        
        sim.output00000.txt: $(BIN)
                /bin/sh -c '\
       -        ./$(BIN) --length 8.0 \
       -        --normal-stress 200e3 \
       -        --stress-ratio 0.40 \
       -        --fluid \
       -        --fluid-permeability 2e-17 \
       -        --fluid-pressure-top 100e3 \
       -        --fluid-pressure-ampl 80e3 \
       -        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
       -        --file-interval $$( echo "60*10" | bc -l ) \
       -        --time-end $$( echo "3600*24*7" | bc -l ) sim'
       +        ./$(BIN) -L 8.0 \
       +        -n 200e3 \
       +        -f 0.40 \
       +        -F \
       +        -k 2e-17 \
       +        -O 100e3 \
       +        -a 80e3 \
       +        -q $$( echo "1.0/(3600*24)" | bc -l ) \
       +        -I $$( echo "60*10" | bc -l ) \
       +        -e $$( echo "3600*24*7" | bc -l ) sim'
        
        ../$(FIG).pdf: fig.gp sim.output00000.txt
                gnuplot fig.gp > $@
 (DIR) diff --git a/fig-stick_slip_rate/Makefile b/fig-stick_slip_rate/Makefile
       t@@ -5,17 +5,17 @@ default: ../$(FIG).pdf
        
        sim.output00000.txt: $(BIN)
                /bin/sh -c '\
       -        ./$(BIN) --length 8.0 \
       -        --normal-stress 200e3 \
       -        --set-shear-velocity $$( echo "1000/(365*24*60*60)" | bc -l ) \
       -        --grain-size 1e-3 \
       -        --fluid \
       -        --fluid-permeability 2e-17 \
       -        --fluid-pressure-top 100e3 \
       -        --fluid-pressure-ampl 80e3 \
       -        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
       -        --file-interval $$( echo "60*10" | bc -l ) \
       -        --time-end $$( echo "3600*24*7" | bc -l ) sim'
       +        ./$(BIN) -L 8.0 \
       +        -n 200e3 \
       +        -s $$( echo "1000/(365*24*60*60)" | bc -l ) \
       +        -d 1e-3 \
       +        -F \
       +        -k 2e-17 \
       +        -O 100e3 \
       +        -a 80e3 \
       +        -q $$( echo "1.0/(3600*24)" | bc -l ) \
       +        -I $$( echo "60*10" | bc -l ) \
       +        -e $$( echo "3600*24*7" | bc -l ) sim'
        
        timeseries.txt: sim.output00000.txt
                /bin/sh -c '\
 (DIR) diff --git a/fig-stick_slip_rate_depth/Makefile b/fig-stick_slip_rate_depth/Makefile
       t@@ -9,11 +9,11 @@ sim.output00001.txt: ../fig-stick_slip_rate/sim.output00001.txt
        ../$(FIG).pdf: fig.gp sim.output00001.txt ../skindepth.gp $(BIN) Makefile
                sh -c '\
                        out=$$($(BIN) \
       -                        --normal-stress 200e3 \
       -                        --fluid-permeability 2e-17 \
       -                        --fluid-pressure-top 100e3 \
       -                        --fluid-pressure-ampl 80e3 \
       -                        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l )\
       +                        -n 200e3 \
       +                        -k 2e-17 \
       +                        -O 100e3 \
       +                        -a 80e3 \
       +                        -q $$( echo "1.0/(3600*24)" | bc -l )\
                                ); \
                        max_def_depth=$$(echo $$out | cut -d" " -f1); \
                        skin_depth=$$(echo $$out | cut -d" " -f2); \
 (DIR) diff --git a/fig-stick_slip_rate_depth/fig.gp b/fig-stick_slip_rate_depth/fig.gp
       t@@ -51,7 +51,7 @@ set xlabel "{/:Normal Eff. normal stress [kPa]}"
        plot for [t = t0:tend:inc] filename(t) u ($3/1e3):(L_z - $1):(t-t0) w l lc palette lw 1 t ""
        
        unset label
       -set label "C (rate controlled)" at screen 0.395,0.97 font ",12"
       +set label "C (speed controlled)" at screen 0.395,0.97 font ",12"
        set xlabel "{/:Normal Shear speed [km/a]}"
        set ylabel ""
        unset ytics
       t@@ -64,7 +64,7 @@ set arrow from xmin,max_def_depth to xmax,max_def_depth nohead front lc black da
        plot for [t = t0:tend:inc] filename(t) u ($2*60*60*24*365/1000):(L_z - $1):(t-t0) w l lc palette lw 1 t ""
        
        unset label
       -set label "D (rate controlled)" at screen 0.705,0.97 font ",12"
       +set label "D (speed controlled)" at screen 0.705,0.97 font ",12"
        set xlabel "{/:Normal Shear strain rate [1/d]}"
        set ylabel ""
        xmin = -2.0
 (DIR) diff --git a/fig-stick_slip_rate_depth_local/Makefile b/fig-stick_slip_rate_depth_local/Makefile
       t@@ -9,11 +9,11 @@ sim.output00001.txt: ../fig-stick_slip_rate_nonlocality/sim.output00001.txt
        ../$(FIG).pdf: fig.gp sim.output00001.txt ../skindepth.gp $(BIN) Makefile
                sh -c '\
                        out=$$($(BIN) \
       -                        --normal-stress 200e3 \
       -                        --fluid-permeability 2e-17 \
       -                        --fluid-pressure-top 100e3 \
       -                        --fluid-pressure-ampl 80e3 \
       -                        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l )\
       +                        -n 200e3 \
       +                        -k 2e-17 \
       +                        -O 100e3 \
       +                        -a 80e3 \
       +                        -q $$( echo "1.0/(3600*24)" | bc -l )\
                                ); \
                        max_def_depth=$$(echo $$out | cut -d" " -f1); \
                        skin_depth=$$(echo $$out | cut -d" " -f2); \
 (DIR) diff --git a/fig-stick_slip_rate_local/Makefile b/fig-stick_slip_rate_local/Makefile
       t@@ -5,18 +5,18 @@ default: ../$(FIG).pdf
        
        sim.output00000.txt: $(BIN)
                /bin/sh -c '\
       -        ./$(BIN) --length 8.0 \
       -        --normal-stress 200e3 \
       -        --set-shear-velocity $$( echo "1000/(365*24*60*60)" | bc -l ) \
       -        --grain-size 1e-3 \
       +        ./$(BIN) -L 8.0 \
       +        -n 200e3 \
       +        -s $$( echo "1000/(365*24*60*60)" | bc -l ) \
       +        -d 1e-3 \
                -A 1e-3 \
       -        --fluid \
       -        --fluid-permeability 2e-17 \
       -        --fluid-pressure-top 100e3 \
       -        --fluid-pressure-ampl 80e3 \
       -        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
       -        --file-interval $$( echo "60*10" | bc -l ) \
       -        --time-end $$( echo "3600*24*2" | bc -l ) sim'
       +        -F \
       +        -k 2e-17 \
       +        -O 100e3 \
       +        -a 80e3 \
       +        -q $$( echo "1.0/(3600*24)" | bc -l ) \
       +        -I $$( echo "60*10" | bc -l ) \
       +        -e $$( echo "3600*24*2" | bc -l ) sim'
        
        timeseries.txt: sim.output00000.txt
                /bin/sh -c '\
 (DIR) diff --git a/fig-stick_slip_stress/Makefile b/fig-stick_slip_stress/Makefile
       t@@ -5,16 +5,16 @@ default: ../$(FIG).pdf
        
        sim.output00000.txt: $(BIN)
                /bin/sh -c '\
       -        ./$(BIN) --length 8.0 \
       -        --normal-stress 200e3 \
       -        --stress-ratio 0.40 \
       -        --fluid \
       -        --fluid-permeability 2e-17 \
       -        --fluid-pressure-top 100e3 \
       -        --fluid-pressure-ampl 80e3 \
       -        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
       -        --file-interval $$( echo "60*10" | bc -l ) \
       -        --time-end $$( echo "3600*24*7" | bc -l ) sim'
       +        ./$(BIN) -L 8.0 \
       +        -n 200e3 \
       +        -f 0.40 \
       +        -F \
       +        -k 2e-17 \
       +        -O 100e3 \
       +        -a 80e3 \
       +        -q $$( echo "1.0/(3600*24)" | bc -l ) \
       +        -I $$( echo "60*10" | bc -l ) \
       +        -e $$( echo "3600*24*7" | bc -l ) sim'
        
        timeseries.txt: sim.output00000.txt
                /bin/sh -c '\
 (DIR) diff --git a/fig-stick_slip_stress_depth/Makefile b/fig-stick_slip_stress_depth/Makefile
       t@@ -9,11 +9,11 @@ sim.output00001.txt: ../fig-stick_slip_stress/sim.output00001.txt
        ../$(FIG).pdf: fig.gp sim.output00001.txt ../skindepth.gp $(BIN) Makefile
                sh -c '\
                        out=$$($(BIN) \
       -                        --normal-stress 200e3 \
       -                        --fluid-permeability 2e-17 \
       -                        --fluid-pressure-top 100e3 \
       -                        --fluid-pressure-ampl 80e3 \
       -                        --fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l )\
       +                        -n 200e3 \
       +                        -k 2e-17 \
       +                        -O 100e3 \
       +                        -a 80e3 \
       +                        -q $$( echo "1.0/(3600*24)" | bc -l )\
                                ); \
                        max_def_depth=$$(echo $$out | cut -d" " -f1); \
                        skin_depth=$$(echo $$out | cut -d" " -f2); \
 (DIR) diff --git a/fig-strain_distribution/Makefile b/fig-strain_distribution/Makefile
       t@@ -5,16 +5,18 @@ default: ../$(FIG).pdf
        
        strain_distribution_N10kPa.txt: $(BIN) Makefile
                /bin/sh -c '\
       -        for P in 10 20 40 60 80 120; do \
       +        for N in 10 20 40 60 80 120; do \
                        ./$(BIN) \
       -                --friction-coefficient 0.4 \
       -                --set-shear-velocity 0.0369 \
       -                --origo 0.05 --length 0.64 --normal-stress $${P}e3 \
       -                --porosity 0.275 \
       -                --grain-size 0.04 \
       +                -m 0.4 \
       +                -s 0.0369 \
       +                -o 0.05 \
       +                -L 0.64 \
       +                -n $${N}e3 \
       +                -p 0.275 \
       +                -d 0.04 \
                        -A 0.5 \
                        -b 0.022 \
       -                --normalize > strain_distribution_N$${P}kPa.txt; \
       +                -N > strain_distribution_N$${N}kPa.txt; \
                done'
        
        ../$(FIG).pdf: fig.gp strain_distribution_N10kPa.txt damsgaard2013-sheardisp/sheardisp*-binned.dat
 (DIR) diff --git a/fig-strain_distribution/fig.gp b/fig-strain_distribution/fig.gp
       t@@ -29,13 +29,13 @@ set key bottom right font ",9" samplen 1.0
        
        pointsize=0.6
        
       -plot "strain_distribution_N10kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#ee2430" title "{/:Bold Model} 10 kPa", \
       +plot "strain_distribution_N10kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#ee2430" title "{/:Bold CNGF-PF} 10 kPa", \
                "damsgaard2013-sheardisp/sheardisp10-binned.dat" w p ps pointsize lw 2 lc "#ee2430" title "DEM, 10 kPa", \
       -        "strain_distribution_N20kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#53bf3a" title "{/:Bold Model} 20 kPa", \
       +        "strain_distribution_N20kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#53bf3a" title "{/:Bold CNGF-PF} 20 kPa", \
                "damsgaard2013-sheardisp/sheardisp20-binned.dat" w p ps pointsize lw 2 lc "#53bf3a" title "DEM 20 kPa", \
       -        "strain_distribution_N40kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#2f54ad" title "{/:Bold Model} 40 kPa", \
       +        "strain_distribution_N40kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#2f54ad" title "{/:Bold CNGF-PF} 40 kPa", \
                "damsgaard2013-sheardisp/sheardisp40-binned.dat" w p ps pointsize lw 2 lc "#2f54ad" title "DEM 40 kPa", \
       -        "strain_distribution_N80kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#6ccfd9" title "{/:Bold Model} 80 kPa", \
       +        "strain_distribution_N80kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#6ccfd9" title "{/:Bold CNGF-PF} 80 kPa", \
                "damsgaard2013-sheardisp/sheardisp80-binned.dat" w p ps pointsize lw 2 lc "#6ccfd9" title "DEM 80 kPa", \
       -        #"strain_distribution_N120kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#231f20" title "{/:Bold Model} 120 kPa", \
       +        #"strain_distribution_N120kPa.txt" u ($2*xdisp):1 w l lw 2 lc "#231f20" title "{/:Bold CNGF-PF} 120 kPa", \
                #"damsgaard2013-sheardisp/sheardisp120-binned.dat" w p ps pointsize lw 2 lc "#231f20" title "DEM 120 kPa"
 (DIR) diff --git a/fig-strain_distribution_local/Makefile b/fig-strain_distribution_local/Makefile
       t@@ -5,16 +5,18 @@ default: ../$(FIG).pdf
        
        strain_distribution_N10kPa.txt: $(BIN) Makefile
                /bin/sh -c '\
       -        for P in 10 20 40 60 80 120; do \
       +        for N in 10 20 40 60 80 120; do \
                        ./$(BIN) \
       -                --friction-coefficient 0.4 \
       -                --set-shear-velocity 0.0369 \
       -                --origo 0.05 --length 0.64 --normal-stress $${P}e3 \
       -                --porosity 0.275 \
       -                --grain-size 0.04 \
       +                -m 0.4 \
       +                -s 0.0369 \
       +                -o 0.05 \
       +                -L 0.64 \
       +                -n $${N}e3 \
       +                -p 0.275 \
       +                -d 0.04 \
                        -A 1e-3 \
                        -b 0.022 \
       -                --normalize > strain_distribution_N$${P}kPa.txt; \
       +                -N > strain_distribution_N$${N}kPa.txt; \
                done'
        
        ../$(FIG).pdf: fig.gp strain_distribution_N10kPa.txt damsgaard2013-sheardisp/sheardisp*-binned.dat