 |
tmove everything into root - hansen-zoet-exp - comparison of lab and model resu… |
 |
git clone git://src.adamsgaard.dk/hansen-zoet-exp |
 |
Log |
|
Files |
|
Refs |
|
Submodules |
|
--- |
|
commit 1f7b63d9cd4b5ce2e352dd20cce8ffa8a6bfea78 |
|
parent bc8a54a07b30860b95d64c40e1193c72fad1a7f3 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Sat, 23 Apr 2022 12:50:44 +0200 |
|
|
|
move everything into root |
|
|
|
Diffstat: |
|
M Makefile | 64 +++++++++++++++++++++++++----… |
|
D fig-effective_stress/Makefile | 61 -----------------------------… |
|
D fig-effective_stress/fig-strain_di… | 46 ---------------------------… |
|
R fig-effective_stress/fig-mohr_coul… | 0 |
|
R fig-effective_stress/fig-sediment_… | 0 |
|
A fig-strain_distribution.gp | 46 +++++++++++++++++++++++++++++… |
|
R fig-effective_stress/rs_sediment_f… | 0 |
|
R fig-effective_stress/rs_sediment_f… | 0 |
|
|
|
8 files changed, 99 insertions(+), 118 deletions(-) |
|
--- |
|
diff --git a/Makefile b/Makefile |
|
t@@ -1,26 +1,68 @@ |
|
.POSIX: |
|
|
|
REPO = cngf-pf |
|
-FIGDIRS != find . -maxdepth 1 -type d -name 'fig-*' | sed 's/\.\///' |
|
-FIGURES = $(FIGDIRS:=.pdf) |
|
+BIN = ${REPO}/cngf-pf |
|
+PDFS = \ |
|
+ fig-strain_distribution.pdf \ |
|
+ fig-strain_distribution.pdf \ |
|
+ fig-mohr_coulomb.pdf \ |
|
+ fig-sediment_flux.pdf |
|
|
|
-default: ${REPO}/cngf-pf $(FIGURES) |
|
+stressvals = 5 8 10 15 20 22 25 30 35 40 45 50 |
|
+velvals = 3.169e-6 9.506e-6 |
|
|
|
-${REPO}/cngf-pf: ${REPO}/cngf-pf.c |
|
+default: ${PDFS} |
|
+ |
|
+${BIN}: ${REPO}/cngf-pf.c |
|
CFLAGS="-march=native -O3 -pipe" make -C ${REPO} |
|
|
|
${REPO}/cngf-pf.c: |
|
git submodule update --init |
|
|
|
-fig-effective_stress.pdf: $(REPO)/$(REPO) |
|
- (cd $(@:.pdf=) && make) |
|
+strain_distribution_N50kPa_v3.169e-6ms.txt: ${BIN} Makefile |
|
+ sh -c '\ |
|
+ for v in ${velvals}; do \ |
|
+ for P in ${stressvals}; do \ |
|
+ ./${BIN} \ |
|
+ -d 530.7e-6 \ |
|
+ -m 0.625 \ |
|
+ -c 0e3 \ |
|
+ -s $${v} \ |
|
+ -L 0.11 \ |
|
+ -n $${P}e3 \ |
|
+ -A 0.48 \ |
|
+ -b 0.0003 \ |
|
+ > strain_distribution_N$${P}kPa_v$${v}ms.txt; \ |
|
+ done; done' # also close fit with lower A and higher b |
|
+ |
|
+mohr_coulomb_v3.169e-6ms.txt: strain_distribution_N50kPa_v3.169e-6ms.txt |
|
+ sh -c '\ |
|
+ rm -f mohr_coulomb_v*ms.txt; \ |
|
+ for v in ${velvals}; do \ |
|
+ for P in ${stressvals}; do \ |
|
+ tail -n 1 strain_distribution_N$${P}kPa_v$${v}ms.txt >… |
|
+ done; done' |
|
+ |
|
+sediment_flux_v3.169e-6ms.txt: strain_distribution_N50kPa_v3.169e-6ms.txt |
|
+ sh -c '\ |
|
+ rm -f sediment_flux_v*ms.txt; \ |
|
+ for v in ${velvals}; do \ |
|
+ for P in ${stressvals}; do \ |
|
+ (printf "%ge3\t" $$P; ${REPO}/shear_flux < strain_dist… |
|
+ done; done' |
|
+ |
|
+fig-strain_distribution.pdf: fig-strain_distribution.gp strain_distribution_N5… |
|
+ gnuplot fig-strain_distribution.gp > $@ |
|
+ |
|
+fig-mohr_coulomb.pdf: fig-mohr_coulomb.gp mohr_coulomb_v3.169e-6ms.txt |
|
+ gnuplot fig-mohr_coulomb.gp > $@ |
|
|
|
-$(REPO)/Makefile: |
|
- git submodule update --init --recursive |
|
+fig-sediment_flux.pdf: fig-sediment_flux.gp sediment_flux_v3.169e-6ms.txt |
|
+ gnuplot fig-sediment_flux.gp > $@ |
|
|
|
clean: |
|
+ rm -f strain_distribution_*.txt mohr_coulomb_*.txt sediment_flux_*.txt |
|
+ rm -f ${PDFS} |
|
make -C $(REPO)/ clean |
|
- rm -f fig*.pdf |
|
- for d in $(FIGDIRS); do (cd $$d && make clean); done |
|
|
|
-.PHONY: default figures clean |
|
+.PHONY: default clean |
|
diff --git a/fig-effective_stress/Makefile b/fig-effective_stress/Makefile |
|
t@@ -1,61 +0,0 @@ |
|
-BIN = ../cngf-pf/cngf-pf |
|
-FIG = $(shell basename $(CURDIR)) |
|
- |
|
-stressvals = 5 8 10 15 20 22 25 30 35 40 45 50 |
|
-velvals = 3.169e-6 9.506e-6 |
|
- |
|
- |
|
-default: \ |
|
- ../$(FIG)-strain_distribution.pdf \ |
|
- ../$(FIG)-mohr_coulomb.pdf \ |
|
- ../$(FIG)-sediment_flux.pdf |
|
- |
|
-strain_distribution_N50kPa_v3.169e-6ms.txt: $(BIN) Makefile |
|
- sh -c '\ |
|
- for v in ${velvals}; do \ |
|
- for P in ${stressvals}; do \ |
|
- ./$(BIN) \ |
|
- -d 530.7e-6 \ |
|
- -m 0.625 \ |
|
- -c 0e3 \ |
|
- -s $${v} \ |
|
- -L 0.11 \ |
|
- -n $${P}e3 \ |
|
- -A 0.48 \ |
|
- -b 0.0003 \ |
|
- > strain_distribution_N$${P}kPa_v$${v}ms.txt; \ |
|
- done; done' |
|
- # also close: lower A, higher b |
|
- |
|
-mohr_coulomb_v3.169e-6ms.txt: strain_distribution_N50kPa_v3.169e-6ms.txt |
|
- sh -c '\ |
|
- rm -f mohr_coulomb_v*ms.txt; \ |
|
- for v in ${velvals}; do \ |
|
- for P in ${stressvals}; do \ |
|
- tail -n 1 strain_distribution_N$${P}kPa_v$${v}ms.txt >… |
|
- done; done' |
|
- |
|
-sediment_flux_v3.169e-6ms.txt: strain_distribution_N50kPa_v3.169e-6ms.txt |
|
- sh -c '\ |
|
- rm -f sediment_flux_v*ms.txt; \ |
|
- for v in ${velvals}; do \ |
|
- for P in ${stressvals}; do \ |
|
- (printf "%ge3\t" $$P; ../cngf-pf/shear_flux < strain_d… |
|
- done; done' |
|
- |
|
-../$(FIG)-strain_distribution.pdf: fig-strain_distribution.gp strain_distribut… |
|
- gnuplot fig-strain_distribution.gp > $@ |
|
- |
|
-../$(FIG)-mohr_coulomb.pdf: fig-mohr_coulomb.gp mohr_coulomb_v3.169e-6ms.txt |
|
- gnuplot fig-mohr_coulomb.gp > $@ |
|
- |
|
-../$(FIG)-sediment_flux.pdf: fig-sediment_flux.gp sediment_flux_v3.169e-6ms.txt |
|
- gnuplot fig-sediment_flux.gp > $@ |
|
- |
|
-clean: |
|
- rm -f strain_distribution_*.txt mohr_coulomb_*.txt sediment_flux_*.txt |
|
- rm -f ../$(FIG)-strain_distribution.pdf |
|
- rm -f ../$(FIG)-mohr_coulomb.pdf |
|
- rm -f ../$(FIG)-sediment_flux.pdf |
|
- |
|
-.PHONY: default clean |
|
diff --git a/fig-effective_stress/fig-strain_distribution.gp b/fig-effective_st… |
|
t@@ -1,46 +0,0 @@ |
|
-#!/usr/bin/env gnuplot |
|
- |
|
-reset |
|
- |
|
-set terminal pdfcairo enhanced color size 10 cm, 10 cm |
|
-set multiplot layout 1,2 |
|
- |
|
-set lmargin 10.0 |
|
-set bmargin 3.5 |
|
-set rmargin 2.0 |
|
-set tmargin 2.0 |
|
- |
|
-set xrange [-5 : 105] |
|
-set yrange [0.09 : 0.11] |
|
- |
|
-#set xlabel "Normalized horizontal velocity, v_x [-]" |
|
-set xlabel "Horizontal velocity, v_x [m/a]" |
|
-set ylabel "Vertical position, z [m]" |
|
-set key bottom right font ",10" #samplen 0.9 |
|
-set title "v = 100 m/a" |
|
-plot "strain_distribution_N8kPa_v3.169e-6ms.txt" u ($2*365*24*3600):1 w l lw 2… |
|
- "strain_distribution_N22kPa_v3.169e-6ms.txt" u ($2*365*24*3600):1 w l lw … |
|
- "strain_distribution_N50kPa_v3.169e-6ms.txt" u ($2*365*24*3600):1 w l lw … |
|
- |
|
-#unset xrange |
|
- |
|
-##set xlabel "Normalized horizontal velocity, v_x [-]" |
|
-#set xlabel "Shear-strain rate, dv_x/dz [1/d]" |
|
-#set ylabel "Vertical position, z [m]" |
|
-#set key bottom right font ",10" #samplen 0.9 |
|
-#plot "strain_distribution_N8kPa_v9.506e-6ms.txt" u ($6*24*3600):1 w l lw 2 ti… |
|
- #"strain_distribution_N22kPa_v9.506e-6ms.txt" u ($6*24*3600):1 w l lw 2 t… |
|
- #"strain_distribution_N50kPa_v9.506e-6ms.txt" u ($6*24*3600):1 w l lw 2 t… |
|
- |
|
- |
|
-set xrange [-5 : 305] |
|
-#set yrange [0 : 0.11] |
|
- |
|
-#set xlabel "Normalized horizontal velocity, v_x [-]" |
|
-set xlabel "Horizontal velocity, v_x [m/a]" |
|
-set ylabel "Vertical position, z [m]" |
|
-set key bottom right font ",10" #samplen 0.9 |
|
-set title "v = 300 m/a" |
|
-plot "strain_distribution_N8kPa_v9.506e-6ms.txt" u ($2*365*24*3600):1 w l lw 2… |
|
- "strain_distribution_N22kPa_v9.506e-6ms.txt" u ($2*365*24*3600):1 w l lw … |
|
- "strain_distribution_N50kPa_v9.506e-6ms.txt" u ($2*365*24*3600):1 w l lw … |
|
diff --git a/fig-effective_stress/fig-mohr_coulomb.gp b/fig-mohr_coulomb.gp |
|
diff --git a/fig-effective_stress/fig-sediment_flux.gp b/fig-sediment_flux.gp |
|
diff --git a/fig-strain_distribution.gp b/fig-strain_distribution.gp |
|
t@@ -0,0 +1,46 @@ |
|
+#!/usr/bin/env gnuplot |
|
+ |
|
+reset |
|
+ |
|
+set terminal pdfcairo enhanced color size 10 cm, 10 cm |
|
+set multiplot layout 1,2 |
|
+ |
|
+set lmargin 10.0 |
|
+set bmargin 3.5 |
|
+set rmargin 2.0 |
|
+set tmargin 2.0 |
|
+ |
|
+set xrange [-5 : 105] |
|
+set yrange [0.09 : 0.11] |
|
+ |
|
+#set xlabel "Normalized horizontal velocity, v_x [-]" |
|
+set xlabel "Horizontal velocity, v_x [m/a]" |
|
+set ylabel "Vertical position, z [m]" |
|
+set key bottom right font ",10" #samplen 0.9 |
|
+set title "v = 100 m/a" |
|
+plot "strain_distribution_N8kPa_v3.169e-6ms.txt" u ($2*365*24*3600):1 w l lw 2… |
|
+ "strain_distribution_N22kPa_v3.169e-6ms.txt" u ($2*365*24*3600):1 w l lw … |
|
+ "strain_distribution_N50kPa_v3.169e-6ms.txt" u ($2*365*24*3600):1 w l lw … |
|
+ |
|
+#unset xrange |
|
+ |
|
+##set xlabel "Normalized horizontal velocity, v_x [-]" |
|
+#set xlabel "Shear-strain rate, dv_x/dz [1/d]" |
|
+#set ylabel "Vertical position, z [m]" |
|
+#set key bottom right font ",10" #samplen 0.9 |
|
+#plot "strain_distribution_N8kPa_v9.506e-6ms.txt" u ($6*24*3600):1 w l lw 2 ti… |
|
+ #"strain_distribution_N22kPa_v9.506e-6ms.txt" u ($6*24*3600):1 w l lw 2 t… |
|
+ #"strain_distribution_N50kPa_v9.506e-6ms.txt" u ($6*24*3600):1 w l lw 2 t… |
|
+ |
|
+ |
|
+set xrange [-5 : 305] |
|
+#set yrange [0 : 0.11] |
|
+ |
|
+#set xlabel "Normalized horizontal velocity, v_x [-]" |
|
+set xlabel "Horizontal velocity, v_x [m/a]" |
|
+unset ylabel |
|
+set key bottom right font ",10" #samplen 0.9 |
|
+set title "v = 300 m/a" |
|
+plot "strain_distribution_N8kPa_v9.506e-6ms.txt" u ($2*365*24*3600):1 w l lw 2… |
|
+ "strain_distribution_N22kPa_v9.506e-6ms.txt" u ($2*365*24*3600):1 w l lw … |
|
+ "strain_distribution_N50kPa_v9.506e-6ms.txt" u ($2*365*24*3600):1 w l lw … |
|
diff --git a/fig-effective_stress/rs_sediment_flux_100ma.txt b/rs_sediment_flux… |
|
diff --git a/fig-effective_stress/rs_sediment_flux_300ma.txt b/rs_sediment_flux… |
