cngf-pf-exp1

commit 4aa63daf85b52b49566be12c37daa5da6abf280b
parent 1ea5c01df83eb3ac9850086786e2bafa6582f4e2
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Thu, 26 Mar 2020 21:38:03 +0100

Update dependencies and targets

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

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/flux_estimate/Makefile b/flux_estimate/Makefile
@@ -31,7 +31,7 @@ steady_flux: steady.txt
 		printf 'Yearly volume: %.5g m^3/a\n' "$$yearly_volume" && \
 		printf 'Duration:      %.5g a\n' "$$duration"
 
-variable.output00096.txt:
+variable.output00095.txt:
 	$(BIN) $(FLAGS) \
 		-F -a 10e3 \
 		-q $(FREQ) \
@@ -39,7 +39,7 @@ variable.output00096.txt:
 		-e $$(echo 3600.0*24.0*2.0 | bc -l) -I 1800.0 \
 		variable
 
-variable_flux: variable.output00096.txt
+variable_flux: variable.output00095.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 }" ) && \
@@ -50,7 +50,7 @@ variable_flux: variable.output00096.txt
 		printf 'Yearly volume: %.5g m^3/a\n' "$$yearly_volume" && \
 		printf 'Duration:      %.5g a\n' "$$duration"
 
-variable_hi.output00096.txt:
+variable_hi.output00095.txt:
 	$(BIN) $(FLAGS) \
 		-F -a 50e3 \
 		-q $(FREQ) \
@@ -58,9 +58,9 @@ variable_hi.output00096.txt:
 		-e $$(echo 3600.0*24.0*2.0 | bc -l) -I 1800.0 \
 		variable_hi
 
-variable_flux_hi: variable_hi.output00096.txt
+variable_flux_hi: variable_hi.output00095.txt
 	# variable water-pressure, high amplitude
-	@avg_spec_flux=$$($(SHEARFLUX) variable.output*.txt | awk '{sum+=$$1} END{print sum/NR}') && \
+	@avg_spec_flux=$$($(SHEARFLUX) variable_hi.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 }" ) && \
 		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 }" ) && \