cngf-pf

commit 50228220fb64d301510af818d0558680721efe7a
parent 37770a1d5e140e05c6f543797f83c3c3f0e24d3f
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Wed,  6 Nov 2019 09:55:34 +0100

Use POSIX make features for example runs

Diffstat:
M
examples/Makefile
 | 
33
+++++++++++++++++----------------

1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/examples/Makefile b/examples/Makefile
@@ -13,12 +13,13 @@ diurnal.mp4: diurnal.output00000.txt.png
 diurnal.output00000.txt.png: 1d_fd_simple_shear_fluid.gp diurnal.output00000.txt
 	/bin/sh -c '\
 	for f in diurnal.output*.txt; do \
-		gnuplot -e "filename=\"$$f\"; p_min=\"0\"; p_max=\"100e3\"" $< > $$f.png; \
+		gnuplot -e "filename=\"$$f\"; p_min=\"0\"; p_max=\"100e3\"" \
+			1d_fd_simple_shear_fluid.gp > $$f.png; \
 	done'
 
 diurnal.output00000.txt: $(BIN)
 	/bin/sh -c '\
-	./$< --length 8.0 --normal-stress 150e3 \
+	./$(BIN) --length 8.0 --normal-stress 150e3 \
 	--fluid --fluid-permeability 2e-17 \
 	--fluid-pressure-top 50e3 --fluid-pressure-ampl 100e3 \
 	--fluid-pressure-freq $$( echo "1.0/(3600*24)" | bc -l ) \
@@ -32,7 +33,7 @@ diurnal.timeseries.txt: diurnal.output00000.txt
 	done'
 
 diurnal.timeseries.pdf: diurnal.timeseries.gp diurnal.timeseries.txt
-	gnuplot $< > $@
+	gnuplot diurnal.timeseries.gp > $@
 
 diurnal.gif: diurnal.mp4
 	convert diurnal.output*.txt.png \
@@ -41,7 +42,7 @@ diurnal.gif: diurnal.mp4
 1d_fd_simple_shear.png: $(BIN) 1d_fd_simple_shear.gp
 	/bin/sh -c '\
 	for P in 10 20 40 60 80 120; do \
-		./$< --stress-ratio 0.44 -o 0.03 -L 0.64 -P $${P}e3 -N \
+		./$(BIN) --stress-ratio 0.44 -o 0.03 -L 0.64 -P $${P}e3 -N \
 			> 1d_fd_simple_shear_P$${P}kPa.txt; \
 	done'
 	gnuplot 1d_fd_simple_shear.gp > $@
@@ -53,7 +54,7 @@ diurnal.gif: diurnal.mp4
 		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 | \
+			./$(BIN) -P 20e3 --stress-ratio $$t -b $$b | \
 			tail -n 1 | cut -f2 >> "$$out"; \
 	done; done'
 	gnuplot 1d_fd_simple_shear_rheology.gp > $@
@@ -66,7 +67,7 @@ diurnal.gif: diurnal.mp4
 		rm -f "$$out"; \
 		for t in $$(seq 0.01 0.01 2.0); do \
 			printf "$$t\t" >> "$$out"; \
-			./$< -f 0.443 -C 1.0e3 -P 1.7e3 --stress-ratio $$t -b $$b | \
+			./$(BIN) -f 0.443 -C 1.0e3 -P 1.7e3 --stress-ratio $$t -b $$b | \
 			tail -n 1 | cut -f2 >> "$$out"; \
 	done; done'
 	gnuplot 1d_fd_simple_shear_rheology_kamb.gp > $@
@@ -80,7 +81,7 @@ diurnal.gif: diurnal.mp4
 		rm -f "$$out"; \
 		for t in $$(seq 0.0001 0.002 1.0); do \
 			printf "$$t\t" >> "$$out"; \
-			./$< -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 | \
 			tail -n 1 | cut -f2 >> "$$out"; \
 	done; done'
 	gnuplot 1d_fd_simple_shear_rheology_iverson.gp > $@
@@ -93,7 +94,7 @@ diurnal.gif: diurnal.mp4
 		rm -f "$$out"; \
 		for t in $$(seq 0.1 0.002 0.9); do \
 			printf "$$t\t" >> "$$out"; \
-			./$< -f 0.5 -P 10e3 --stress-ratio $$t -b $$b | \
+			./$(BIN) -f 0.5 -P 10e3 --stress-ratio $$t -b $$b | \
 			tail -n 1 | cut -f2 >> "$$out"; \
 	done; done'
 	gnuplot 1d_fd_simple_shear_rheology_tulaczyk.gp > $@
@@ -102,13 +103,13 @@ $(BIN):
 	make -C ..
 
 clean:
-	$(RM) *.txt
-	$(RM) *.png
-	$(RM) *.gif
-	$(RM) *.mp4
-	$(RM) *.pdf
-	$(RM) *.o
-	$(RM) 1d_fd_simple_shear.png
-	$(RM) 1d_fd_simple_shear_rheology*.png
+	rm -f *.txt
+	rm -f *.png
+	rm -f *.gif
+	rm -f *.mp4
+	rm -f *.pdf
+	rm -f *.o
+	rm -f 1d_fd_simple_shear.png
+	rm -f 1d_fd_simple_shear_rheology*.png
 
 .PHONY: plots clean