commit 54fa6aaed89a059a2fa542caaddac573a8cdbb04
parent 4bc96f8a56c10951e677d7f205b432de09bb3975
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Tue, 19 Nov 2019 11:27:34 +0100
Remove unused files, fix parameters in Mohr-Coulomb comparison
Diffstat:
14 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/fig-mohr_coulomb/Makefile b/fig-mohr_coulomb/Makefile
@@ -5,12 +5,12 @@ N_SEQ != seq 1 20 220
default: ../$(FIG).pdf
# mimic Iverson 2010 fig 2b
-# Ceasar till (Rathbun et al., 2008)
-mc_ceasar.txt: $(BIN) Makefile
+# Caesar till (Rathbun et al., 2008)
+mc_caesar.txt: $(BIN) Makefile
rm -f $@
for N in $(N_SEQ); do \
printf "$$N\t" >> $@; \
- ./$(BIN) -m 0.5634 -f 0.5634 -C 29.6e3 -P $$N -L 1.0 mc | \
+ ./$(BIN) -m 0.532 -f 0.532 -C -6.5e3 -P $$N -L 1.0 mc | \
tail -n 1 | cut -f4 >> $@; \
done
@@ -46,11 +46,11 @@ mc_wis.txt: $(BIN) Makefile
rm -f $@
for N in $(N_SEQ); do \
printf "$$N\t" >> $@; \
- ./$(BIN) -m 0.443 -f 0.443 -C 3.0e3 -P $$N -L 1.0 mc | \
+ ./$(BIN) -m 0.445 -f 0.445 -C 3.0e3 -P $$N -L 1.0 mc | \
tail -n 1 | cut -f4 >> $@; \
done
-../$(FIG).pdf: fig.gp mc_ceasar.txt mc_storglaciaren.txt mc_two_rivers.txt mc_des_moines_lobe.txt mc_wis.txt *.dat
+../$(FIG).pdf: fig.gp mc_caesar.txt mc_storglaciaren.txt mc_two_rivers.txt mc_des_moines_lobe.txt mc_wis.txt *.dat
gnuplot fig.gp > $@
clean:
diff --git a/fig-mohr_coulomb/ceasar.dat b/fig-mohr_coulomb/ceasar.dat
@@ -1,2 +0,0 @@
-3.0e3 0.54
-9.0e5 0.58
diff --git a/fig-mohr_coulomb/cowden.dat b/fig-mohr_coulomb/cowden.dat
@@ -1,2 +0,0 @@
-3.2e3 0.52
-5.0e5 0.52
diff --git a/fig-mohr_coulomb/des_moines_lobe.dat b/fig-mohr_coulomb/des_moines_lobe.dat
@@ -1,2 +0,0 @@
-9.0e2 0.505
-4.0e4 0.45
diff --git a/fig-mohr_coulomb/fig.gp b/fig-mohr_coulomb/fig.gp
@@ -17,15 +17,22 @@ set xlabel "Effective normal stress {/Symbol s}_n' [kPa]"
set xrange [0:200]
set yrange [0:120]
+set angles degrees
+caesar(x) = (x >= 50 && x <= 5000) ? tan(28)*x - 6.5 : 1/0 # Rathbun et al., 2008, saturated Caesar till
+storglaciaren(x) = (x >= 25 && x <= 150) ? tan(26.3)*x + 5 : 1/0 # Iverson et al., 1998
+two_rivers(x) = (x >= 30 && x <= 145) ? tan(17.8)*x + 14 : 1/0 # Iverson et al., 1998
+# Des Moines Lobe till properties extracted from Iverson 2010 plot, mc_des_moines_lobe.dat
+wis(x) = (x >= 20 && x <= 310) ? tan(24)*x + 3 : 1/0 # Tulaczyk et al., 2000
+
set key top left reverse Left font ",8" samplen 2.0
-plot "mc_ceasar.dat" w l lt 3 lw 2 t "Ceasar till (Rathbun et al., 2008)", \
- "mc_ceasar.txt" u ($1):($2*$1 - 6.5) w l lt 3 lw 2 t "Simulated Ceasar till", \
- "mc_storglaciaren.dat" w l lt 4 lw 2 t "Storglaciaren till (Iverson et al., 1998)", \
- "mc_storglaciaren.txt" u ($1):($2*$1 + 5) w l lt 4 lw 2 t "Simulated Storglaciaren till", \
- "mc_two_rivers.dat" w l lt 5 lw 2 t "Two Rivers till (Iverson et al., 1998)", \
- "mc_two_rivers.txt" u ($1):($2*$1 + 14) w l lt 5 lw 2 t "Simulated Two Rivers till", \
+plot caesar(x) w l lt 3 lw 2 t "Caesar till (Rathbun et al., 2008)", \
+ "mc_caesar.txt" u ($1):($2*$1 - 6.5) w l dashtype 2 lt 3 lw 2 t "Simulated Caesar till", \
+ storglaciaren(x) w l lt 4 lw 2 t "Storglaciaren till (Iverson et al., 1998)", \
+ "mc_storglaciaren.txt" u ($1):($2*$1 + 5) w l dashtype 2 lt 4 lw 2 t "Simulated Storglaciaren till", \
+ two_rivers(x) w l lt 5 lw 2 t "Two Rivers till (Iverson et al., 1998)", \
+ "mc_two_rivers.txt" u ($1):($2*$1 + 14) w l dashtype 2 lt 5 lw 2 t "Simulated Two Rivers till", \
"mc_des_moines_lobe.dat" w l lt 6 lw 2 t "Des Moines Lobe till (Iverson, 2010)", \
- "mc_des_moines_lobe.txt" u ($1):($2*$1 + 4.23) w l lt 6 lw 2 t "Simulated Des Moines Lobe till", \
- "mc_wis.dat" w l lt 7 lw 2 t "WIS till (Tulaczyk et al., 2001)", \
- "mc_wis.txt" u ($1):($2*$1 + 3) w l lt 7 lw 2 t "Simulated WIS till"
+ "mc_des_moines_lobe.txt" u ($1):($2*$1 + 4.23) w l dashtype 2 lt 6 lw 2 t "Simulated Des Moines Lobe till", \
+ wis(x) w l lt 7 lw 2 t "WIS till (Tulaczyk et al., 2000)", \
+ "mc_wis.txt" u ($1):($2*$1 + 3) w l dashtype 2 lt 7 lw 2 t "Simulated WIS till"
diff --git a/fig-mohr_coulomb/lower_cromer.dat b/fig-mohr_coulomb/lower_cromer.dat
@@ -1,2 +0,0 @@
-5.0e1 0.60
-7.0e4 0.56
diff --git a/fig-mohr_coulomb/mc_caesar.dat b/fig-mohr_coulomb/mc_caesar.dat
@@ -1,2 +0,0 @@
-48 19
-200 100
diff --git a/fig-mohr_coulomb/mc_storglaciaren.dat b/fig-mohr_coulomb/mc_storglaciaren.dat
@@ -1,2 +0,0 @@
-20 17
-135 75
diff --git a/fig-mohr_coulomb/mc_two_rivers.dat b/fig-mohr_coulomb/mc_two_rivers.dat
@@ -1,2 +0,0 @@
-30 24
-140 60
diff --git a/fig-mohr_coulomb/mc_wis.dat b/fig-mohr_coulomb/mc_wis.dat
@@ -1,2 +0,0 @@
-25 13
-200 90
diff --git a/fig-mohr_coulomb/storglaciaren.dat b/fig-mohr_coulomb/storglaciaren.dat
@@ -1,2 +0,0 @@
-5.3e2 0.57
-2.3e4 0.52
diff --git a/fig-mohr_coulomb/two_rivers.dat b/fig-mohr_coulomb/two_rivers.dat
@@ -1,2 +0,0 @@
-1.8e3 0.475
-8.0e4 0.44
diff --git a/fig-mohr_coulomb/wis.dat b/fig-mohr_coulomb/wis.dat
@@ -1,2 +0,0 @@
-1.0e1 0.504
-1.0e5 0.495
diff --git a/fig-rate_dependence/fig.gp b/fig-rate_dependence/fig.gp
@@ -26,7 +26,7 @@ set label "{/:Bold b}" at screen 0.11,0.44
plot "cowden.dat" w l lw 2 t "Cowden till (Tika et al., 1996)", \
"lower_cromer.dat" w l lw 2 t "Lower Cromer till (Tika et al., 1996)", \
- "ceasar.dat" w l lw 2 t "Ceasar till (Rathbun et al., 2008)", \
+ "caesar.dat" w l lw 2 t "Caesar till (Rathbun et al., 2008)", \
"storglaciaren.dat" w l lw 2 t "Storglaciaren till (Iverson et al., 1998)", \
"two_rivers.dat" w l lw 2 t "Two Rivers till (Iverson et al., 1998)", \
"des_moines_lobe.dat" w l lw 2 t "Des Moines Lobe till (Iverson, 2010)", \
