commit b3e24e64943968daacc934d3549a983991b95207
parent 5d525ee59d2ddb29c691b5a83da9d57b3d0d7106
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Thu, 11 Apr 2019 16:50:42 +0200
Improve correspondence to Kamb 1991
Diffstat:
5 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/1d_fd_simple_shear_rheology.gp b/1d_fd_simple_shear_rheology.gp
@@ -20,26 +20,3 @@ plot "1d_fd_simple_shear_rheology_b0.01.txt" u 1:2 w lp lw 2 t "b = 0.01", \
"1d_fd_simple_shear_rheology_b1.00.txt" u 1:2 w lp lw 2 t "b = 1.0"
set xtics norotate # Restore defaults
-
-##
-
-set terminal pngcairo color size 18.6 cm, 17.6 cm
-set output "1d_fd_simple_shear_rheology_md.png"
-set xlabel "Applied friction, mu = tau/N [-]"
-set ylabel "Shear velocity, v [m/d]" offset 2
-
-set xrange [0.0:0.7]
-set yrange [0.0:2.5]
-set key top left #samplen 0.9
-
-set style line 1 linetype 1 linewidth 3 pointtype 1 pointsize 1
-
-plot "1d_fd_simple_shear_rheology_b0.01.txt" u 1:($2*3600*24) w l lw 2 t "b = 0.01", \
- "1d_fd_simple_shear_rheology_b0.10.txt" u 1:($2*3600*24) w l lw 2 t "b = 0.1", \
- "1d_fd_simple_shear_rheology_b0.20.txt" u 1:($2*3600*24) w l lw 2 t "b = 0.2", \
- "1d_fd_simple_shear_rheology_b0.40.txt" u 1:($2*3600*24) w l lw 2 t "b = 0.4", \
- "1d_fd_simple_shear_rheology_b0.60.txt" u 1:($2*3600*24) w l lw 2 t "b = 0.6", \
- "1d_fd_simple_shear_rheology_b0.80.txt" u 1:($2*3600*24) w l lw 2 t "b = 0.8", \
- "1d_fd_simple_shear_rheology_b1.00.txt" u 1:($2*3600*24) w l lw 2 t "b = 1.0"
-
-set xtics norotate # Restore defaults
diff --git a/1d_fd_simple_shear_rheology_kamb.png b/1d_fd_simple_shear_rheology_kamb.png
Binary files differ.
diff --git a/1d_fd_simple_shear_rheology_md.png b/1d_fd_simple_shear_rheology_md.png
Binary files differ.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,8 @@ OBJ=$(patsubst %.c,%.o,$(SRC))
HDR=$(wildcard *.h)
default: 1d_fd_simple_shear.png \
- 1d_fd_simple_shear_rheology.png
+ 1d_fd_simple_shear_rheology.png \
+ 1d_fd_simple_shear_rheology_kamb.png
1d_fd_simple_shear: $(OBJ) $(HDR)
$(CC) $(LDFLAGS) $(OBJ) -o $@
@@ -22,8 +23,8 @@ default: 1d_fd_simple_shear.png \
1d_fd_simple_shear_rheology.png: 1d_fd_simple_shear 1d_fd_simple_shear_rheology.gp
/bin/bash -c '\
for b in $$(printf "0.01\n0.10\n"; seq 0.20 0.20 1.00); do \
- out="$<_rheology_b$$b.txt"; \
- rm "$$out"; \
+ out="$<_rheology_b$${b}.txt"; \
+ rm -f "$$out"; \
for t in $$(seq 0.01 0.01 0.8); do \
printf "$$t\t" >> "$$out"; \
./$< -P 20e3 --stress-ratio $$t -b $$b | \
@@ -31,6 +32,20 @@ default: 1d_fd_simple_shear.png \
done; done'
gnuplot $<_rheology.gp > $@
+
+# 1 bar is equal to 100 kPa
+1d_fd_simple_shear_rheology_kamb.png: 1d_fd_simple_shear 1d_fd_simple_shear_rheology_kamb.gp
+ /bin/bash -c '\
+ for b in $$(printf "0.01\n0.10\n"; seq 0.20 0.20 1.00); do \
+ out="$<_rheology_b$${b}_kamb.txt"; \
+ rm -f "$$out"; \
+ for t in $$(seq 0.01 0.01 2.0); do \
+ printf "$$t\t" >> "$$out"; \
+ ./$< -f 1.0 -P 1.7e3 --stress-ratio $$t -b $$b | \
+ tail -n 1 | cut -f2 >> "$$out"; \
+ done; done'
+ gnuplot $<_rheology_kamb.gp > $@
+
.PHONY: watch
watch:
echo $(SRC) $(HDR) | tr ' ' '\n' | entr -s 'make && ./1d_fd_simple_shear'
@@ -40,4 +55,4 @@ clean:
$(RM) *.o
$(RM) 1d_fd_simple_shear
$(RM) 1d_fd_simple_shear.png
- $(RM) 1d_fd_simple_shear_rheology.png
+ $(RM) 1d_fd_simple_shear_rheology*.png
diff --git a/README.md b/README.md
@@ -37,9 +37,9 @@ Glass beads have *b* = 0.94.
-Vertical axis rescaled to Kamb 1991:
+Comparison to Kamb 1991:
-
+
#### Kamb 1991, subglacial till from Upstream-B site
