tRemove unused simulation run and show forcing amplitude with max depth - cngf-pf-exp1 - experiments for first paper with continuum granular model
HTML git clone git://src.adamsgaard.dk/manus_continuum_granular1_exp
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 3d1610046bfb2d7e757de98059c34e8314b55d16
DIR parent e7321da5aad796d273c97677965ab8c1a697557f
HTML Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Thu, 9 Jul 2020 14:13:06 +0200
Remove unused simulation run and show forcing amplitude with max depth
Diffstat:
M flux_estimate/Makefile | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
---
DIR diff --git a/flux_estimate/Makefile b/flux_estimate/Makefile
t@@ -15,7 +15,7 @@ FLAGS = -m 0.45 -c 3e3 -n 100e3 -d 1e-3 -s $(VEL) -L 4.0 -p $(POROSITY)
TARGET_VOL = 5.34e11
-default: steady_flux variable_flux variable_flux_hi variable_flux_higher
+default: steady_flux variable_flux variable_flux_hi
steady.txt:
$(BIN) $(FLAGS) > $@
t@@ -60,14 +60,6 @@ variable_hi.output00095.txt:
-e $$(echo 3600.0*24.0*2.0 | bc -l) -I 1800.0 \
variable_hi
-variable_higher.output00095.txt:
- $(BIN) $(FLAGS) \
- -F -a 100e3 \
- -q $(FREQ) \
- -k $(PERMEABILITY) \
- -e $$(echo 3600.0*24.0*2.0 | bc -l) -I 1800.0 \
- variable_higher
-
variable_flux_hi: variable_hi.output00095.txt
# variable water-pressure, high amplitude
@avg_spec_flux=$$($(SHEARFLUX) variable_hi.output*.txt | awk '{sum+=$$1} END{print sum/NR}') && \
t@@ -80,20 +72,9 @@ variable_flux_hi: variable_hi.output00095.txt
printf 'Yearly volume: %.5g m^3/a\n' "$$yearly_volume" && \
printf 'Duration: %.5g a\n' "$$duration"
-variable_flux_higher: variable_higher.output00095.txt
- # variable water-pressure, high amplitude
- @avg_spec_flux=$$($(SHEARFLUX) variable_higher.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 }" ) && \
- printf 'Specific flux: %.5g m^2/s\n' "$$avg_spec_flux" && \
- printf ' %.5g m^2/a\n' "$$(awk -v q="$$avg_spec_flux" 'BEGIN {print q*3600.0*24.0*365.0}')" && \
- 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"
-
amplitude_dependence:
for A in 10e3 20e3 30e3 40e3 50e3 100e3; do \
+ printf '%s\t' "$$A"; \
$(MAXDEPTH) -p $(POROSITY) -k $(PERMEABILITY) -a $$A -q $(FREQ); \
done
t@@ -101,4 +82,4 @@ clean:
rm -f steady.txt
find . -type f -name 'variable*.output*.txt' -delete
-.PHONY: default clean steady_flux variable_flux variable_flux_hi variable_flux_higher
+.PHONY: default clean steady_flux variable_flux variable_flux_hi