manus_continuum_granular1_exp

Experiments for first paper with continuum granular model
git clone git://src.adamsgaard.dk/.manus_continuum_granular1_exp
Log | Files | Refs | Submodules | README | LICENSE

commit 2db96a2740fd5884df64373fb3e0b223653166e3
parent 298c64a69532effde078eb3c8166013e02364070
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Sat,  6 Jul 2019 11:15:27 +0200

Name all simulations

Diffstat:
Mfig1/Makefile | 6+++---
Mfig2/Makefile | 8++++----
Mfig3/Makefile | 8++++----
Mfig4/Makefile | 6+++---
Mfig4/fig.gp | 2+-
Mfig5/Makefile | 6+++---
Mfig5/fig.gp | 2+-
7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/fig1/Makefile b/fig1/Makefile @@ -6,18 +6,18 @@ default: ../$(FIG).pdf # mimic Iverson 2010 fig 2a # shear-strain rate from 10^1 to 10^6 m/a # friction around 0.55 -unnamed.output00000.txt: $(BIN) Makefile +sim.output00000.txt: $(BIN) Makefile /bin/sh -c '\ for b in $$(printf "0.01\n0.10\n"; seq 0.20 0.20 0.90) 0.94; do \ out="out_b$${b}.txt"; \ rm -f "$$out"; \ for t in $$(seq 0.0001 0.002 1.0); do \ printf "$$t\t" >> "$$out"; \ - ./$(BIN) -f 0.55 -P 100e3 -L 1.0 --stress-ratio $$t -b $$b | \ + ./$(BIN) -f 0.55 -P 100e3 -L 1.0 --stress-ratio $$t -b $$b sim | \ tail -n 1 | cut -f2 >> "$$out"; \ done; done' -../$(FIG).pdf: fig.gp unnamed.output00000.txt +../$(FIG).pdf: fig.gp sim.output00000.txt gnuplot $< > $@ clean: diff --git a/fig2/Makefile b/fig2/Makefile @@ -3,18 +3,18 @@ FIG = $(shell basename $(CURDIR)) default: ../$(FIG).pdf -unnamed.output00000.txt: $(BIN) +sim.output00000.txt: $(BIN) /bin/sh -c '\ ./$< --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 "60*10" | bc -l ) \ - --time-end $$( echo "3600*24*7" | bc -l )' + --time-end $$( echo "3600*24*7" | bc -l ) sim' -timeseries.txt: unnamed.output00000.txt +timeseries.txt: sim.output00000.txt /bin/sh -c '\ - for f in unnamed.output*.txt; do \ + for f in sim.output*.txt; do \ tail -n 1 "$$f" | cut -f2- >> $@; \ done' diff --git a/fig3/Makefile b/fig3/Makefile @@ -3,18 +3,18 @@ FIG = $(shell basename $(CURDIR)) default: ../$(FIG).pdf -unnamed.output00000.txt: $(BIN) +sim.output00000.txt: $(BIN) /bin/sh -c '\ ./$< --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 "60*10" | bc -l ) \ - --time-end $$( echo "3600*24*7" | bc -l )' + --time-end $$( echo "3600*24*7" | bc -l ) sim' -timeseries.txt: unnamed.output00000.txt +timeseries.txt: sim.output00000.txt /bin/sh -c '\ - for f in unnamed.output*.txt; do \ + for f in sim.output*.txt; do \ tail -n 1 "$$f" | cut -f2- >> $@; \ done' diff --git a/fig4/Makefile b/fig4/Makefile @@ -3,16 +3,16 @@ FIG = $(shell basename $(CURDIR)) default: ../$(FIG).pdf -unnamed.output00000.txt: $(BIN) Makefile ../skindepth.gp +sim.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 )' + --time-end $$( echo "3600*24*3 + 3600" | bc -l ) sim' -../$(FIG).pdf: fig.gp unnamed.output00000.txt +../$(FIG).pdf: fig.gp sim.output00000.txt gnuplot $< > $@ clean: diff --git a/fig4/fig.gp b/fig4/fig.gp @@ -15,7 +15,7 @@ set key bottom right #samplen 0.9 t0 = 47 tend = 70 -filename(t) = sprintf('unnamed.output%05d.txt', t) +filename(t) = sprintf('sim.output%05d.txt', t) set pm3d map set palette rgb 10,6,6 diff --git a/fig5/Makefile b/fig5/Makefile @@ -3,7 +3,7 @@ FIG = $(shell basename $(CURDIR)) default: ../$(FIG).pdf -unnamed.output00000.txt: $(BIN) Makefile ../skindepth.gp +sim.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 \ @@ -11,9 +11,9 @@ unnamed.output00000.txt: $(BIN) Makefile ../skindepth.gp --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' + --normalize sim' -../$(FIG).pdf: fig.gp unnamed.output00000.txt +../$(FIG).pdf: fig.gp sim.output00000.txt gnuplot $< > $@ clean: diff --git a/fig5/fig.gp b/fig5/fig.gp @@ -15,7 +15,7 @@ set key bottom right #samplen 0.9 t0 = 47 tend = 70 -filename(t) = sprintf('unnamed.output%05d.txt', t) +filename(t) = sprintf('sim.output%05d.txt', t) set pm3d map set palette rgb 10,6,6