cngf-pf-exp1

commit a1b10832f92cbf31f9fa1afa7a9cfd3e0e04a340
parent 89502f6fa25406175caa4194d384c6735cacf21c
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Thu,  9 Jul 2020 22:56:14 +0200

Use Tulaczyk2000 diffusivity for WAIS till

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

1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/flux_estimate/Makefile b/flux_estimate/Makefile
@@ -14,7 +14,7 @@ FREQ_DAILY != echo 1.0/3600.0/24.0 | bc -l
 FREQ_MONTHLY != echo 1.0/3600.0/24.0/30.0 | bc -l
 FREQ_YEARLY != echo 1.0/3600.0/24.0/30.0 | bc -l
 FREQ=$(FREQ_DAILY)
-FLAGS = -m 0.45 -c 3e3 -n 100e3 -d 1e-3 -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) -D 1e-8 -q $(FREQ)
 
 TARGET_VOL = 5.34e11
 
@@ -38,8 +38,6 @@ steady_flux: steady.txt
 variable.output00095.txt:
 	$(BIN) $(FLAGS) \
 		-F -a 10e3 \
-		-q $(FREQ) \
-		-k $(PERMEABILITY) \
 		-e $$(echo 3600.0*24.0*2.0 | bc -l) -I 1800.0 \
 		variable
 
@@ -58,8 +56,6 @@ variable_flux: variable.output00095.txt
 variable_hi.output00095.txt:
 	$(BIN) $(FLAGS) \
 		-F -a 50e3 \
-		-q $(FREQ) \
-		-k $(PERMEABILITY) \
 		-e $$(echo 3600.0*24.0*2.0 | bc -l) -I 1800.0 \
 		variable_hi
 
@@ -75,14 +71,8 @@ variable_flux_hi: variable_hi.output00095.txt
 		printf 'Yearly volume: %.5g m^3/a\n' "$$yearly_volume" && \
 		printf 'Duration:      %.5g a\n' "$$duration"
 
-amplitude_dependence:
-	for A in 10e3 20e3 40e3 80e3 160e3 320e3 640e3 1200e3; do \
-		printf '%s\t' "$$A"; \
-		$(MAXDEPTH) -p $(POROSITY) -k $(PERMEABILITY) -a $$A -q $(FREQ); \
-	done
-
 truffer_comparison:
-	for A in 10e3 20e3 40e3 80e3 160e3 320e3 640e3 1200e3; do \
+	for A in 10e3 20e3 40e3 80e3 160e3 320e3 640e3 1000e3; do \
 		printf '%s\t' "$$A"; \
 		$(MAXDEPTH) -D 1.5e-5 -a $$A -q $(FREQ_YEARLY); \
 	done