cngf-pf-exp1

commit 0d6395d771839c9aa388135b748f1107af1dc344
parent 4094800486ea9f53af7cbc2ab69682410105a9cc
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Thu, 26 Mar 2020 14:41:56 +0100

Rearrange steady-state setup in same format as variable hydrology runs

Diffstat:
M
flux_estimate/Makefile
 | 
49
++++++++++++++++++++++---------------------------

1 file changed, 22 insertions(+), 27 deletions(-)
diff --git a/flux_estimate/Makefile b/flux_estimate/Makefile
@@ -11,33 +11,27 @@ VEL != echo 1000.0/365.0/24.0/3600.0 | bc -l
 POROSITY = 0.35
 PERMEABILITY = 4.9e-17
 FREQ != echo 1.0/3600.0/24.0 | bc -l
-FLAGS = -m 0.45 -c 3e3 -n 100e3 -d 1e-3 -n 100e3 -s $(VEL) -L 4.0 -p $(POROSITY)
+FLAGS = -m 0.45 -c 3e3 -n 100e3 -d 1e-3 -s $(VEL) -L 4.0 -p $(POROSITY)
 
-# flux per unit width under constant hydrology [m^2/s]
-SPEC_FLUX_STEADY != $(BIN) $(FLAGS) | $(SHEARFLUX)
-
-# total sediment volume passing WIDTH [m^3/s]
-FLUX_STEADY != awk -v w=$(WIDTH) -v f=$(SPEC_FLUX_STEADY) "BEGIN { print w*f }"
-
-# total sediment volume passing WIDTH [m^3/a]
-YEARLY_VOL_STEADY != awk -v f=$(FLUX_STEADY) "BEGIN { print f*3600.0*24.0*365.0 }"
-
-# target sediment volume [m^3]
 TARGET_VOL = 5.34e11
 
-# time required to reach TARGET_VOLUME [a]
-YEAR_DURATION_STEADY != awk -v t=$(TARGET_VOL) -v v=$(YEARLY_VOL_STEADY) "BEGIN { print t/v }"
+default: steady_flux variable_flux variable_flux_hi
 
-default: steady variable_flux variable_flux_hi
+steady.txt:
+	$(BIN) $(FLAGS) > $@
 
-steady:
-	# steady state hydrology
-	@printf 'Specific flux: %.5g m^2/s\n' "$(SPEC_FLUX_STEADY)"
-	@printf 'Flux:          %.5g m^3/s\n' "$(FLUX_STEADY)"
-	@printf 'Yearly volume: %.5g m^3/a\n' "$(YEARLY_VOL_STEADY)"
-	@printf 'Duration:      %.5g a\n' "$(YEAR_DURATION_STEADY)"
+steady_flux: steady.txt
+	# steady-state hydrology
+	@avg_spec_flux=$$($(SHEARFLUX) steady.txt) && \
+		avg_flux=$$(awk -v avg_spec_flux="$$avg_spec_flux" "BEGIN { print $(WIDTH)*avg_spec_flux }" ) && \
+		yearly_volume=$$(awk -v avg_flux="$$avg_flux" "BEGIN { print avg_flux*3600.0*24.0*365.0 }" ) && \
+		duration=$$(awk -v target_vol=$(TARGET_VOL) -v yearly_volume="$$yearly_volume" "BEGIN { print target_vol/yearly_volume }" ) && \
+		printf 'Specific flux: %.5g m^2/s\n' "$$avg_spec_flux" && \
+		printf 'Avg. flux:     %.5g m^3/s\n' "$$avg_flux" && \
+		printf 'Yearly volume: %.5g m^3/a\n' "$$yearly_volume" && \
+		printf 'Duration:      %.5g a\n' "$$duration"
 
-variable.output00048.txt:
+variable.output00096.txt:
 	$(BIN) $(FLAGS) \
 		-F -a 10e3 \
 		-q $(FREQ) \
@@ -45,7 +39,7 @@ variable.output00048.txt:
 		-e $$(echo 3600.0*24.0*2.0 | bc -l) -I 1800.0 \
 		variable
 
-variable_flux: variable.output00048.txt
+variable_flux: variable.output00096.txt
 	# variable water-pressure, low amplitude
 	@avg_spec_flux=$$($(SHEARFLUX) variable.output*.txt | awk '{sum+=$$1} END{print sum/NR}') && \
 		avg_flux=$$(awk -v avg_spec_flux="$$avg_spec_flux" "BEGIN { print $(WIDTH)*avg_spec_flux }" ) && \
@@ -53,10 +47,10 @@ variable_flux: variable.output00048.txt
 		duration=$$(awk -v target_vol=$(TARGET_VOL) -v yearly_volume="$$yearly_volume" "BEGIN { print target_vol/yearly_volume }" ) && \
 		printf 'Specific flux: %.5g m^2/s\n' "$$avg_spec_flux" && \
 		printf 'Avg. flux:     %.5g m^3/s\n' "$$avg_flux" && \
-		printf 'Yearly volume: %.5g a\n' "$$yearly_volume" && \
+		printf 'Yearly volume: %.5g m^3/a\n' "$$yearly_volume" && \
 		printf 'Duration:      %.5g a\n' "$$duration"
 
-variable_hi.output00048.txt:
+variable_hi.output00096.txt:
 	$(BIN) $(FLAGS) \
 		-F -a 50e3 \
 		-q $(FREQ) \
@@ -64,7 +58,7 @@ variable_hi.output00048.txt:
 		-e $$(echo 3600.0*24.0*2.0 | bc -l) -I 1800.0 \
 		variable_hi
 
-variable_flux_hi: variable_hi.output00048.txt
+variable_flux_hi: variable_hi.output00096.txt
 	# variable water-pressure, high amplitude
 	@avg_spec_flux=$$($(SHEARFLUX) variable.output*.txt | awk '{sum+=$$1} END{print sum/NR}') && \
 		avg_flux=$$(awk -v avg_spec_flux="$$avg_spec_flux" "BEGIN { print $(WIDTH)*avg_spec_flux }" ) && \
@@ -72,7 +66,7 @@ variable_flux_hi: variable_hi.output00048.txt
 		duration=$$(awk -v target_vol=$(TARGET_VOL) -v yearly_volume="$$yearly_volume" "BEGIN { print target_vol/yearly_volume }" ) && \
 		printf 'Specific flux: %.5g m^2/s\n' "$$avg_spec_flux" && \
 		printf 'Avg. flux:     %.5g m^3/s\n' "$$avg_flux" && \
-		printf 'Yearly volume: %.5g a\n' "$$yearly_volume" && \
+		printf 'Yearly volume: %.5g m^3/a\n' "$$yearly_volume" && \
 		printf 'Duration:      %.5g a\n' "$$duration"
 
 amplitude_dependence:
@@ -81,7 +75,8 @@ amplitude_dependence:
 	done
 
 clean:
-	find . -type f -name 'variable.output*.txt' -delete
+	rm -f steady.txt
+	find . -type f -name 'variable*.output*.txt' -delete
 	rm -f variable_flux
 
 .PHONY: default steady clean variable_flux variable_flux_hi