tDo not write output file before first computation, add range to plot args - cn… | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 4447957289b397389b61f55edafbc40c083c9f84 | |
parent 8d198db9fbebc9d453932f009c71f2ba8ed4a81a | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 16 Apr 2019 19:22:38 +0200 | |
Do not write output file before first computation, add range to plot args | |
Diffstat: | |
M 1d_fd_simple_shear_fluid.gp | 12 +++++++----- | |
M Makefile | 8 ++++---- | |
M main.c | 1 - | |
3 files changed, 11 insertions(+), 10 deletions(-) | |
--- | |
diff --git a/1d_fd_simple_shear_fluid.gp b/1d_fd_simple_shear_fluid.gp | |
t@@ -9,17 +9,19 @@ set multiplot layout 1,3 | |
set ylabel "Vertical position, z [m]" offset 2 | |
set yrange [0.0:0.73] | |
-#set xrange [-0.1:1.05] | |
set key bottom right #samplen 0.9 | |
set xlabel "Normalized horizontal velocity, v_x [-]" | |
+#set xrange [-0.1:1.05] | |
plot filename u 2:1 w l lw 2 lc "red" t "" | |
-set xlabel "Effective normal stress [kPa]" | |
-plot filename u ($3/1000):1 w l lw 2 lc "black" t "" | |
+set xlabel "Effective normal stress [Pa]" | |
+set xrange [0:200e3] | |
+plot filename u 3:1 w l lw 2 lc "black" t "" | |
-set xlabel "Water pressure, p_f [kPa]" | |
-plot filename u ($4/1000):1 w l lw 2 lc "blue" t "" | |
+set xlabel "Water pressure, p_f [Pa]" | |
+set xrange [p_min:p_max] | |
+plot filename u 4:1 w l lw 2 lc "blue" t "" | |
unset multiplot | |
diff --git a/Makefile b/Makefile | |
t@@ -14,14 +14,14 @@ plots: 1d_fd_simple_shear.png \ | |
1d_fd_simple_shear_rheology_iverson.png \ | |
1d_fd_simple_shear_rheology_tulaczyk.png | |
-.PHONY: diurnal | |
-diurnaltest: 1d_fd_simple_shear 1d_fd_simple_shear_fluid.gp | |
+diurnal.mp4: 1d_fd_simple_shear 1d_fd_simple_shear_fluid.gp | |
/usr/bin/env zsh -c '\ | |
- ./$< --resolution 10 --normal-stress 150e3 --fluid --fluid-pressure-to… | |
+ ./$< --resolution 10 --normal-stress 150e3 --fluid --fluid-pressure-to… | |
/bin/bash -c '\ | |
for f in diurnal.output*.txt; do \ | |
- gnuplot -e "filename=\"$$f\"" $<_fluid.gp > $$f.png; \ | |
+ gnuplot -e "filename=\"$$f\"; p_min=\"0\"; p_max=\"150e3\"" $<… | |
done' | |
+ ffmpeg -i diurnal.output%05d.txt.png diurnal.mp4 | |
1d_fd_simple_shear: $(OBJ) $(HDR) | |
$(CC) $(LDFLAGS) $(OBJ) -o $@ | |
diff --git a/main.c b/main.c | |
t@@ -231,7 +231,6 @@ int main(int argc, char* argv[]) | |
puts(""); | |
#endif | |
- write_output_file(&sim); | |
double filetimeclock = 0.0; | |
while (sim.t <= sim.t_end) { | |