commit 46759ced57a9bcf765826bbcc06b6deb38a6d20f
parent 9c642d72b8e7cbc2355cc6ae865500327be0d5f1
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Thu, 4 Jul 2019 12:21:54 +0200
Add hysteresis figure and increment all figure numbers past 3
Diffstat:
8 files changed, 108 insertions(+), 110 deletions(-)
diff --git a/fig3/Makefile b/fig3/Makefile
@@ -3,16 +3,22 @@ FIG = fig3
default: ../$(FIG).pdf
-unnamed.output00000.txt: $(BIN) Makefile ../skindepth.gp
+unnamed.output00000.txt: $(BIN)
/bin/sh -c '\
- ./$< --resolution 200 --length 8.0 --normal-stress 150e3 \
+ ./$< --resolution 50 --length 2.0 --normal-stress 150e3 \
--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 "3600" | bc -l ) \
- --time-end $$( echo "3600*24*3 + 3600" | bc -l )'
+ --file-interval $$( echo "60*10" | bc -l ) \
+ --time-end $$( echo "3600*24*7" | bc -l )'
-../$(FIG).pdf: fig.gp unnamed.output00000.txt
+timeseries.txt: unnamed.output00000.txt
+ /bin/sh -c '\
+ for f in unnamed.output*.txt; do \
+ tail -n 1 "$$f" | cut -f2- >> $@; \
+ done'
+
+../$(FIG).pdf: fig.gp timeseries.txt
gnuplot $< > $@
clean:
diff --git a/fig3/fig.gp b/fig3/fig.gp
@@ -1,62 +1,18 @@
#!/usr/bin/env gnuplot
-
reset
-#set terminal pdfcairo color size 7.5 cm, 7.5 cm
-set terminal pdfcairo color size 15.0 cm, 5.0 cm
-set multiplot layout 1,4 \
- margins 0.09,0.97,0.23,0.95 \
- spacing 0.03,0.03
-
-set yrange [4.0:8.0]
-
-set key bottom right #samplen 0.9
-
-t0 = 47
-tend = 70
-
-filename(t) = sprintf('unnamed.output%05d.txt', t)
-
-set pm3d map
-set palette rgb 10,6,6
-
-load '../skindepth.gp'
-k = 2e-17
-f = 1.0/(3600.0*24.0)
-f(x) = 8.0 - skindepth(f,k)
-
-unset colorbox
-set xlabel "Water pressure [kPa]"
-set ylabel "Vertical position, z [m]"
-set xrange [0:100]
-plot for [t = t0:tend] filename(t) u ($4/1e3):1:(t-t0) w l lc palette lw 1 t "", \
- f(x) title "" w l
-
-set xlabel "Eff. normal stress [kPa]"
-set ylabel ""
-set xrange [0:200]
-unset ytics
-plot for [t = t0:tend] filename(t) u ($3/1e3):1:(t-t0) w l lc palette lw 1 t "", \
- f(x) title "" w l
+set terminal pdfcairo color size 7.5 cm, 5.0 cm
-set xlabel "Shear velocity [m/s]"
-set ylabel ""
-set xrange [0.0:0.06]
-set xtics (0,0.02,0.04,0.06)
-unset ytics
-plot for [t = t0:tend] filename(t) u 2:1:(t-t0) w l lc palette lw 1 t "", \
- f(x) title "" w l
+# set xrange [0.0:0.7]
+# set yrange [0.0:0.01]
+# set key top left #samplen 0.9
-set xlabel "Shear strain rate [1/s]"
-set ylabel ""
-set xrange [0:3.1e-3]
-#set format x "%.0s*10^{%T}"
-set xtics (0,0.001,0.002,0.003)
-unset ytics
-prev1 = prev2 = 0
-shift(x) = (prev2 = prev1, prev1 = x)
-plot for [t = t0:tend] filename(t) u (shift($2), $0 < 1 ? 1/0 : $2 - prev2):1:(t-t0) w l lc palette lw 1 t "", \
- f(x) title "" w l
-unset format x
+set xrange [40:160]
+set x2range [110:-10]
+set x2tics 20 nomirror tc lt 3
-unset multiplot
+set xlabel "Effective normal stress [kPa]"
+set x2label "Water pressure [kPa]" tc lt 3
+set ylabel "Shear velocity [km/d]"
+plot \
+"timeseries.txt" u ($2/1000):($1*60*60*24/1000) w l lc "red" t ""
diff --git a/fig4/Makefile b/fig4/Makefile
@@ -10,8 +10,7 @@ unnamed.output00000.txt: $(BIN) Makefile ../skindepth.gp
--fluid-pressure-ampl 50e3 \
--fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
--file-interval $$( echo "3600" | bc -l ) \
- --time-end $$( echo "3600*24*3 + 3600" | bc -l ) \
- --normalize'
+ --time-end $$( echo "3600*24*3 + 3600" | bc -l )'
../$(FIG).pdf: fig.gp unnamed.output00000.txt
gnuplot $< > $@
diff --git a/fig4/fig.gp b/fig4/fig.gp
@@ -39,20 +39,19 @@ unset ytics
plot for [t = t0:tend] filename(t) u ($3/1e3):1:(t-t0) w l lc palette lw 1 t "", \
f(x) title "" w l
-set xlabel "Shear velocity [-]"
+set xlabel "Shear velocity [m/s]"
set ylabel ""
-set xrange [0.0:1.0]
-#set xtics (0,0.01,0.02)
+set xrange [0.0:0.06]
+set xtics (0,0.02,0.04,0.06)
unset ytics
plot for [t = t0:tend] filename(t) u 2:1:(t-t0) w l lc palette lw 1 t "", \
f(x) title "" w l
set xlabel "Shear strain rate [1/s]"
set ylabel ""
-#set xrange [0:3.1e-3]
-set xrange [0.0:0.15]
-set xtics (0,0.05,0.10,0.15)
+set xrange [0:3.1e-3]
#set format x "%.0s*10^{%T}"
+set xtics (0,0.001,0.002,0.003)
unset ytics
prev1 = prev2 = 0
shift(x) = (prev2 = prev1, prev1 = x)
diff --git a/fig5/Makefile b/fig5/Makefile
@@ -1,11 +1,23 @@
+BIN = ../1d_fd_simple_shear/1d_fd_simple_shear
FIG = fig5
default: ../$(FIG).pdf
-../$(FIG).pdf: fig.gp
+unnamed.output00000.txt: $(BIN) Makefile ../skindepth.gp
+ /bin/sh -c '\
+ ./$< --resolution 200 --length 8.0 --normal-stress 150e3 \
+ --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 "3600" | bc -l ) \
+ --time-end $$( echo "3600*24*3 + 3600" | bc -l ) \
+ --normalize'
+
+../$(FIG).pdf: fig.gp unnamed.output00000.txt
gnuplot $< > $@
clean:
+ $(RM) *.txt
$(RM) ../$(FIG).pdf
.PHONY: default clean
diff --git a/fig5/fig.gp b/fig5/fig.gp
@@ -2,47 +2,62 @@
reset
-set terminal pdfcairo color size 7.5 cm, 6.0 cm
+#set terminal pdfcairo color size 7.5 cm, 7.5 cm
+set terminal pdfcairo color size 15.0 cm, 5.0 cm
+set multiplot layout 1,4 \
+ margins 0.09,0.97,0.23,0.95 \
+ spacing 0.03,0.03
-set lmargin at screen 0.24
-set rmargin at screen 0.75
-set bmargin at screen 0.20
-set tmargin at screen 0.95
+set yrange [4.0:8.0]
set key bottom right #samplen 0.9
-# hydraulic parameters
-phi = 0.25
-beta_f = 4.5e-10
-mu_f = 0.001
-#k = 2e-17
-k_min = 1e-19
-k_max = 1e-14
-
-# forcing parameters
-#f = 1.0/(3600.0*24.0)
-#f_min = 1.0/(3600.0*24*365) # 1/s
-#f_max = 1.0/3600.0 # 1/s
-f_min = 1.0/(24*365) # 1/h
-f_max = 1.0 # 1/h
-
-# f: frequency, k: permeability
-#skindepth(f,k) = (k/(phi*mu_f*beta_f*3.141592654*f))**(0.5) # f: 1/s
-skindepth(f,k) = (k/(phi*mu_f*beta_f*3.141592654*(f/3600)))**(0.5) # f: 1/h
-
-set xlabel "Forcing frequency [1/h]"
-set ylabel "Permeability [m^2]"
-
-set logscale xyzcb
-set xrange [f_min:f_max]
-set yrange [k_min:k_max]
-set samples 100
-set isosamples 60
-
-# Generate contours
-set view map
-unset surface
-set contour
-set cntrparam levels discrete 0.1, 0.3, 1, 3, 10, 30, 100, 300
-set key outside title "Skin depth\n[m]" width 1.0 samplen 2.5
-splot skindepth(x,y) title ""
+t0 = 47
+tend = 70
+
+filename(t) = sprintf('unnamed.output%05d.txt', t)
+
+set pm3d map
+set palette rgb 10,6,6
+
+load '../skindepth.gp'
+k = 2e-17
+f = 1.0/(3600.0*24.0)
+f(x) = 8.0 - skindepth(f,k)
+
+unset colorbox
+set xlabel "Water pressure [kPa]"
+set ylabel "Vertical position, z [m]"
+set xrange [0:100]
+plot for [t = t0:tend] filename(t) u ($4/1e3):1:(t-t0) w l lc palette lw 1 t "", \
+ f(x) title "" w l
+
+set xlabel "Eff. normal stress [kPa]"
+set ylabel ""
+set xrange [0:200]
+unset ytics
+plot for [t = t0:tend] filename(t) u ($3/1e3):1:(t-t0) w l lc palette lw 1 t "", \
+ f(x) title "" w l
+
+set xlabel "Shear velocity [-]"
+set ylabel ""
+set xrange [0.0:1.0]
+#set xtics (0,0.01,0.02)
+unset ytics
+plot for [t = t0:tend] filename(t) u 2:1:(t-t0) w l lc palette lw 1 t "", \
+ f(x) title "" w l
+
+set xlabel "Shear strain rate [1/s]"
+set ylabel ""
+#set xrange [0:3.1e-3]
+set xrange [0.0:0.15]
+set xtics (0,0.05,0.10,0.15)
+#set format x "%.0s*10^{%T}"
+unset ytics
+prev1 = prev2 = 0
+shift(x) = (prev2 = prev1, prev1 = x)
+plot for [t = t0:tend] filename(t) u (shift($2), $0 < 1 ? 1/0 : $2 - prev2):1:(t-t0) w l lc palette lw 1 t "", \
+ f(x) title "" w l
+unset format x
+
+unset multiplot
diff --git a/fig6/Makefile b/fig6/Makefile
@@ -0,0 +1,11 @@
+FIG = fig6
+
+default: ../$(FIG).pdf
+
+../$(FIG).pdf: fig.gp
+ gnuplot $< > $@
+
+clean:
+ $(RM) ../$(FIG).pdf
+
+.PHONY: default clean
diff --git a/fig5/fig.gp b/fig6/fig.gp
