tAdd comparative figure 4b, use same parameters for fig5 as fig4 and 6 - 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 c9fdb036b39437f6ee1c43cb1c9f8738daad7ed8
 (DIR) parent de7211cfff1ac6dca434de8dcb84e3767116b118
 (HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
       Date:   Thu,  5 Sep 2019 14:58:14 +0200
       
       Add comparative figure 4b, use same parameters for fig5 as fig4 and 6
       
       Diffstat:
         M fig4/Makefile                       |       9 ++++++---
         M fig4/fig.gp                         |      17 ++++++++++-------
         A fig4b/Makefile                      |      54 +++++++++++++++++++++++++++++++
         A fig4b/fig.gp                        |      44 +++++++++++++++++++++++++++++++
         M fig5/Makefile                       |       9 ++++++---
         M fig5/fig.gp                         |      23 ++++++++++++++---------
         M fig6/fig.gp                         |       2 +-
         D rate-controlled-fig4/Makefile       |      51 -------------------------------
         D rate-controlled-fig4/fig.gp         |      36 -------------------------------
       
       9 files changed, 135 insertions(+), 110 deletions(-)
       ---
 (DIR) diff --git a/fig4/Makefile b/fig4/Makefile
       t@@ -5,10 +5,13 @@ default: ../$(FIG).pdf
        
        sim.output00000.txt: $(BIN)
                /bin/sh -c '\
       -        ./$< --length 8.0 --normal-stress 150e3 \
       +        ./$< --length 8.0 \
       +        --normal-stress 200e3 \
                --stress-ratio 0.40 \
       -        --fluid --fluid-permeability 2e-17 --fluid-pressure-top 50e3 \
       -        --fluid-pressure-ampl 50e3 \
       +        --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'
 (DIR) diff --git a/fig4/fig.gp b/fig4/fig.gp
       t@@ -4,13 +4,15 @@ reset
        set terminal pdfcairo color size 7.5 cm, 8.5 cm
        
        set multiplot layout 3,1 \
       -        margins 0.19,0.85,0.23,0.95 \
       +        margins 0.19,0.80,0.23,0.95 \
                spacing 0.03,0.03
        
       +set key top right samplen 1.0
        unset xlabel
        unset xtics
       -set yrange [0:270]
       +set yrange [0:320]
        set ylabel "[kPa]"
       +set ytics 100
        plot \
        "timeseries.txt" u ($0/1008*7):($2/1000) w l lw 2 lc "black" t "effective normal stress", \
        "" u ($0/1008*7):($3/1000) w l lw 2 lt 3 dt "-" t "water pressure"
       t@@ -18,17 +20,18 @@ plot \
        unset xtics
        unset ylabel
        unset ytics
       -set yrange [0:4.0]
       -set y2range [0:4.0]
       -set y2tics 1.0
       +#set ytics 2.0
       +set yrange [0:10]
       +set y2range [0:10]
       +set y2tics 2.0
        set y2label "Shear velocity [km/d]"
        plot "" u ($0/1008*7):($1*60*60*24/1000) w l lw 2 lt 7 t ""
        
        set xtics
        unset y2label
        unset y2tics
       -set ytics 0.25
       -set yrange [1.5:0.0]
       +set ytics 0.5
       +set yrange [2.5:0.0]
        set xlabel "Time [d]"
        set ylabel "Depth of max. strain rate [m]"
        plot "max_strainrate_depth.txt" u ($0/1008*7):(8.0 - $1) w l lw 2 lt 4 t ""
 (DIR) diff --git a/fig4b/Makefile b/fig4b/Makefile
       t@@ -0,0 +1,54 @@
       +BIN = ../1d_fd_simple_shear/1d_fd_simple_shear
       +FIG = $(shell basename $(CURDIR))
       +
       +default: ../$(FIG).pdf
       +
       +#        --stress-ratio 0.40 \
       +
       +sim.output00000.txt: $(BIN)
       +        /bin/sh -c '\
       +        ./$< --length 8.0 \
       +        --normal-stress 200e3 \
       +        --set-shear-velocity $$( echo "1000/(365*24*60*60)" | bc -l ) \
       +        --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'
       +
       +timeseries.txt: sim.output00000.txt
       +        /bin/sh -c '\
       +        rm -f $@; \
       +        for f in sim.output*.txt; do \
       +                tail -n 1 "$$f" | cut -f2- >> $@; \
       +        done'
       +
       +max_strainrate_depth.txt: sim.output00000.txt
       +        /bin/sh -c '\
       +        rm -f $@; \
       +        for f in sim.output*.txt; do \
       +                awk " \
       +                        BEGIN{getline; depth=8.0; max=0.0} \
       +                        NF{ \
       +                                if (\$$6 >= max && \$$6+0 > 1e-300) \
       +                                { \
       +                                        max=\$$6; \
       +                                        depth=\$$1; \
       +                                } \
       +                        } \
       +                        END{ \
       +                                print depth,\"\t\",max \
       +                        }" \
       +                        "$$f" >> $@; \
       +        done'
       +
       +../$(FIG).pdf: fig.gp timeseries.txt max_strainrate_depth.txt
       +        gnuplot $< > $@
       +
       +clean:
       +        $(RM) *.txt
       +        $(RM) ../$(FIG).pdf
       +
       +.PHONY: default clean
 (DIR) diff --git a/fig4b/fig.gp b/fig4b/fig.gp
       t@@ -0,0 +1,44 @@
       +#!/usr/bin/env gnuplot
       +reset
       +
       +set terminal pdfcairo color size 7.5 cm, 8.5 cm
       +
       +set multiplot layout 3,1 \
       +        margins 0.19,0.80,0.23,0.95 \
       +        spacing 0.03,0.03
       +
       +set key top right samplen 1.0
       +unset xlabel
       +unset xtics
       +set yrange [0:320]
       +set ylabel "[kPa]"
       +set ytics 100
       +plot \
       +"timeseries.txt" u ($0/1008*7):($2/1000) w l lw 2 lc "black" t "effective normal stress", \
       +"" u ($0/1008*7):($3/1000) w l lw 2 lt 3 dt "-" t "water pressure"
       +
       +unset xtics
       +unset ylabel
       +unset ytics
       +#set ytics 0.1
       +#set yrange [0:1]
       +#set y2range [0:1]
       +#set y2tics 0.2
       +#set y2label "Effective friction [-]"
       +#plot "" u ($0/1008*7):($4) w l lw 2 lt 7 t ""
       +set yrange [0:80]
       +set y2range [0:80]
       +set y2tics 20
       +set y2label "Shear stress [kPa]"
       +plot "" u ($0/1008*7):($4*$2/1000) w l lw 2 lt 1 t ""
       +
       +set xtics
       +unset y2label
       +unset y2tics
       +set ytics 0.5
       +set yrange [2.5:0.0]
       +set xlabel "Time [d]"
       +set ylabel "Depth of max. strain rate [m]"
       +plot "max_strainrate_depth.txt" u ($0/1008*7):(8.0 - $1) w l lw 2 lt 4 t ""
       +
       +unset multiplot
 (DIR) diff --git a/fig5/Makefile b/fig5/Makefile
       t@@ -5,10 +5,13 @@ default: ../$(FIG).pdf
        
        sim.output00000.txt: $(BIN)
                /bin/sh -c '\
       -        ./$< --length 8.0 --normal-stress 150e3 \
       +        ./$< --length 8.0 \
       +        --normal-stress 200e3 \
                --stress-ratio 0.4 \
       -        --fluid --fluid-permeability 2e-17 --fluid-pressure-top 50e3 \
       -        --fluid-pressure-ampl 50e3 \
       +        --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'
 (DIR) diff --git a/fig5/fig.gp b/fig5/fig.gp
       t@@ -10,15 +10,18 @@ set multiplot layout 2,1 \
        # set xrange [0.0:0.7]
        # set key top left #samplen 0.9
        
       -set xrange [40:160]
       -set x2range [110:-10]
       -set x2tics 20 nomirror tc lt 3
       +set xrange [0:210]
       +set x2range [200:-10]
       +#set x2tics 50 nomirror tc lt 3
       +set x2tics 50 nomirror
        unset xtics
       -set yrange [-0.2:4.2]
       +#set yrange [-0.2:4.2]
       +set yrange [-0.5:10]
        
       -set x2label "Water pressure [kPa]" tc lt 3
       +#set x2label "Water pressure [kPa]" tc lt 3
       +set x2label "Water pressure [kPa]"
        set ylabel "Shear velocity [km/d]"
       -set ytics 1.0
       +set ytics 2.0
        set arrow from 60,1.0 to 50,2.0 head
        set arrow from 70,3.0 to 83,2.0 head
        plot \
       t@@ -33,9 +36,11 @@ unset ytics
        unset x2label
        unset ylabel
        set y2label "Depth of max. strain rate [m]"
       -set yrange [1.5:-0.1]
       -set y2range [1.5:-0.1]
       -set y2tics 0.25
       +#set y2range [1.5:-0.1]
       +set yrange [2.5:-0.1]
       +set y2range [2.5:-0.1]
       +#set y2tics 0.25
       +set y2tics 0.5
        set arrow from 95,0.10 to 85,0.13 head
        set arrow from 100,0.6 to 110,0.8 head
        set arrow from 150,0.8 to 150.3,0.55 head
 (DIR) diff --git a/fig6/fig.gp b/fig6/fig.gp
       t@@ -13,7 +13,7 @@ set yrange [4.0:8.0]
        set key bottom right #samplen 0.9
        
        t0 = 47
       -tend = 70
       +tend = 71
        #tend = 140
        
        filename(t) = sprintf('sim.output%05d.txt', t)
 (DIR) diff --git a/rate-controlled-fig4/Makefile b/rate-controlled-fig4/Makefile
       t@@ -1,51 +0,0 @@
       -BIN = ../1d_fd_simple_shear/1d_fd_simple_shear
       -FIG = $(shell basename $(CURDIR))
       -
       -default: ../$(FIG).pdf
       -
       -#        --stress-ratio 0.40 \
       -
       -sim.output00000.txt: $(BIN)
       -        /bin/sh -c '\
       -        ./$< --length 8.0 --normal-stress 150e3 \
       -        --set-shear-velocity $$( echo "3000/(365*24*60*60)" | bc -l ) \
       -        --fluid --fluid-permeability 2e-17 --fluid-pressure-top 50e3 \
       -        --fluid-pressure-ampl 50e3 \
       -        --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'
       -
       -timeseries.txt: sim.output00000.txt
       -        /bin/sh -c '\
       -        rm -f $@; \
       -        for f in sim.output*.txt; do \
       -                tail -n 1 "$$f" | cut -f2- >> $@; \
       -        done'
       -
       -max_strainrate_depth.txt: sim.output00000.txt
       -        /bin/sh -c '\
       -        rm -f $@; \
       -        for f in sim.output*.txt; do \
       -                awk " \
       -                        BEGIN{getline; depth=8.0; max=0.0} \
       -                        NF{ \
       -                                if (\$$6 >= max && \$$6+0 > 1e-300) \
       -                                { \
       -                                        max=\$$6; \
       -                                        depth=\$$1; \
       -                                } \
       -                        } \
       -                        END{ \
       -                                print depth,\"\t\",max \
       -                        }" \
       -                        "$$f" >> $@; \
       -        done'
       -
       -../$(FIG).pdf: fig.gp timeseries.txt max_strainrate_depth.txt
       -        gnuplot $< > $@
       -
       -clean:
       -        $(RM) *.txt
       -        $(RM) ../$(FIG).pdf
       -
       -.PHONY: default clean
 (DIR) diff --git a/rate-controlled-fig4/fig.gp b/rate-controlled-fig4/fig.gp
       t@@ -1,36 +0,0 @@
       -#!/usr/bin/env gnuplot
       -reset
       -
       -set terminal pdfcairo color size 7.5 cm, 8.5 cm
       -
       -set multiplot layout 3,1 \
       -        margins 0.19,0.85,0.23,0.95 \
       -        spacing 0.03,0.03
       -
       -unset xlabel
       -unset xtics
       -set yrange [0:270]
       -set ylabel "[kPa]"
       -plot \
       -"timeseries.txt" u ($0/1008*7):($2/1000) w l lw 2 lc "black" t "effective normal stress", \
       -"" u ($0/1008*7):($3/1000) w l lw 2 lt 3 dt "-" t "water pressure"
       -
       -unset xtics
       -unset ylabel
       -#unset ytics
       -set yrange [0:0.01]
       -set y2range [0:0.01]
       -#set y2tics 0.002
       -set y2label "Shear velocity [km/d]"
       -plot "" u ($0/1008*7):($1*60*60*24/1000) w l lw 2 lt 7 t ""
       -
       -set xtics
       -unset y2label
       -unset y2tics
       -set ytics 0.25
       -set yrange [1.5:0.0]
       -set xlabel "Time [d]"
       -set ylabel "Depth of max. strain rate [m]"
       -plot "max_strainrate_depth.txt" u ($0/1008*7):(8.0 - $1) w l lw 2 lt 4 t ""
       -
       -unset multiplot