tAdd flux to stress-controlled plot - 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 1b40b77e1526d162c2eaa4171e2e84eed5c71120
 (DIR) parent 1a34e81d79aed1020612ff27c149bf0a5ec8941b
 (HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
       Date:   Wed, 20 Nov 2019 14:49:57 +0100
       
       Add flux to stress-controlled plot
       
       Diffstat:
         M fig-stick_slip_rate/Makefile        |       4 ++--
         M fig-stick_slip_rate/fig.gp          |       1 -
         M fig-stick_slip_stress/Makefile      |      33 +++++++++++++++++++++++++------
         M fig-stick_slip_stress/fig.gp        |      23 ++++++++++++++---------
       
       4 files changed, 43 insertions(+), 18 deletions(-)
       ---
 (DIR) diff --git a/fig-stick_slip_rate/Makefile b/fig-stick_slip_rate/Makefile
       t@@ -69,7 +69,7 @@ sediment_flux.txt: sim.output00000.txt
                gnuplot fig.gp > $@
        
        clean:
       -        $(RM) *.txt
       -        $(RM) ../$(FIG).pdf
       +        rm -f *.txt
       +        rm -f ../$(FIG).pdf
        
        .PHONY: default clean
 (DIR) diff --git a/fig-stick_slip_rate/fig.gp b/fig-stick_slip_rate/fig.gp
       t@@ -38,7 +38,6 @@ unset ytics
        set yrange [0.0:1e-4]
        set y2range [0.0:1e-4]
        set y2tics 3e-5
       -set y2tics
        set y2label "Specific sediment flux [m/s]"
        set xtics
        set xlabel "Time [d]"
 (DIR) diff --git a/fig-stick_slip_stress/Makefile b/fig-stick_slip_stress/Makefile
       t@@ -1,11 +1,11 @@
        BIN = ../1d_fd_simple_shear/1d_fd_simple_shear
       -FIG = $(shell basename $(CURDIR))
       +FIG != basename $(PWD)
        
        default: ../$(FIG).pdf
        
        sim.output00000.txt: $(BIN)
                /bin/sh -c '\
       -        ./$< --length 8.0 \
       +        ./$(BIN) --length 8.0 \
                --normal-stress 200e3 \
                --stress-ratio 0.40 \
                --fluid \
       t@@ -42,11 +42,32 @@ max_strainrate_depth.txt: sim.output00000.txt
                                "$$f" >> $@; \
                done'
        
       -../$(FIG).pdf: fig.gp timeseries.txt max_strainrate_depth.txt
       -        gnuplot $< > $@
       +# central finite differences
       +sediment_flux.txt: sim.output00000.txt
       +        /bin/sh -c '\
       +        rm -f $@; \
       +        for f in sim.output*.txt; do \
       +                awk " \
       +                        BEGIN{getline; integral=0.0} \
       +                        NF{ \
       +                                if (NR > 1) \
       +                                { \
       +                                        integral+=(\$$2+v_prev)/2.0*(\$$1-z_prev); \
       +                                } \
       +                                z_prev=\$$1; \
       +                                v_prev=\$$2; \
       +                        } \
       +                        END{ \
       +                                print integral \
       +                        }" \
       +                        "$$f" >> $@; \
       +        done'
       +
       +../$(FIG).pdf: fig.gp timeseries.txt max_strainrate_depth.txt sediment_flux.txt
       +        gnuplot fig.gp > $@
        
        clean:
       -        $(RM) *.txt
       -        $(RM) ../$(FIG).pdf
       +        rm -f *.txt
       +        rm -f ../$(FIG).pdf
        
        .PHONY: default clean
 (DIR) diff --git a/fig-stick_slip_stress/fig.gp b/fig-stick_slip_stress/fig.gp
       t@@ -1,13 +1,13 @@
        #!/usr/bin/env gnuplot
        reset
        
       -set terminal pdfcairo color size 7.5 cm, 8.5 cm
       +set terminal pdfcairo color size 7.5 cm, 10 cm
        
       -set multiplot layout 3,1 \
       -        margins 0.19,0.80,0.23,0.95 \
       -        spacing 0.03,0.03
       +set multiplot layout 4,1 \
       +        margins 0.19,0.72,0.10,0.98 \
       +        spacing 0.00,0.00
        
       -set key top right samplen 1.0
       +set key top right samplen 1.0 font ",10"
        unset xlabel
        unset xtics
        set yrange [0:320]
       t@@ -20,20 +20,25 @@ plot \
        unset xtics
        unset ylabel
        unset ytics
       -#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.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
       +unset ylabel
       +unset ytics
       +set yrange [0.0:6e-2]
       +set y2range [0.0:6e-2]
       +set y2tics 2e-2
       +set y2label "Specific sediment flux [m/s]"
       +set xtics
       +set xlabel "Time [d]"
       +plot "sediment_flux.txt" u ($0/1008*7):1 w l lw 2 lt 6 t ""