tconvert total displacement to shear velocity for flux calculation - hansen-zoe… | |
git clone git://src.adamsgaard.dk/hansen-zoet-exp | |
Log | |
Files | |
Refs | |
Submodules | |
--- | |
commit 5f28e55d5037613d8aff6ead4ee41b253aad4ab2 | |
parent f46fbebaeb5cf4eab2caa5ff85154041f945e228 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 7 Jun 2022 19:36:39 +0200 | |
convert total displacement to shear velocity for flux calculation | |
Diffstat: | |
M Makefile | 18 +++++++++++------- | |
1 file changed, 11 insertions(+), 7 deletions(-) | |
--- | |
diff --git a/Makefile b/Makefile | |
t@@ -23,6 +23,8 @@ grain_rate_dependence = 0.002 | |
# sediment flux is proportional to cuberoot(N) | |
# grain_nonlocal_ampl = 0.66 -> a = 2.62 | |
# grain_nonlocal_ampl = 0.33 -> a = 1.79 | |
+time_end = 345600 | |
+time_interval = 1800 | |
default: ${PDFS} strain_distribution_ampl1Pa_freq1.157e-5s.txt | |
t@@ -45,7 +47,7 @@ strain_distribution_N50kPa_v3.169e-6ms.txt: ${BIN} Makefile | |
-n $${P}e3 \ | |
-A ${grain_nonlocal_ampl} \ | |
-b ${grain_rate_dependence} \ | |
- > strain_distribution_N$${P}kPa_v$${v}ms.txt; \ | |
+ >strain_distribution_N$${P}kPa_v$${v}ms.txt; \ | |
done; done' # also close fit with lower A and higher b | |
# higher values of L do not make a difference in flux | |
t@@ -64,12 +66,12 @@ strain_distribution_ampl1Pa_freq1.157e-5s.txt: ${BIN} | |
-A ${grain_nonlocal_ampl} \ | |
-b ${grain_rate_dependence} \ | |
-F \ | |
- -e 345600 \ | |
- -I 1800 \ | |
+ -e ${time_end} \ | |
+ -I ${time_interval} \ | |
-q $${freq} \ | |
-a $${ampl} \ | |
strain_distribution_ampl$${ampl}Pa_freq$${freq}s \ | |
- > strain_distribution_ampl$${ampl}Pa_freq$${freq}s.txt… | |
+ >strain_distribution_ampl$${ampl}Pa_freq$${freq}s.txt;… | |
done; done' | |
mohr_coulomb_v3.169e-6ms.txt: strain_distribution_N50kPa_v3.169e-6ms.txt | |
t@@ -77,7 +79,7 @@ mohr_coulomb_v3.169e-6ms.txt: strain_distribution_N50kPa_v3.… | |
rm -f mohr_coulomb_v*ms.txt; \ | |
for v in ${velvals}; do \ | |
for P in ${stressvals}; do \ | |
- tail -n 1 strain_distribution_N$${P}kPa_v$${v}ms.txt >… | |
+ tail -n 1 strain_distribution_N$${P}kPa_v$${v}ms.txt >… | |
done; done' | |
sediment_flux_v3.169e-6ms.txt: strain_distribution_N50kPa_v3.169e-6ms.txt Make… | |
t@@ -85,7 +87,7 @@ sediment_flux_v3.169e-6ms.txt: strain_distribution_N50kPa_v3… | |
rm -f sediment_flux_v*ms.txt; \ | |
for v in ${velvals}; do \ | |
for P in ${stressvals}; do \ | |
- (printf "%ge3\t" $$P; ../cngf-pf/shear_flux < strain_d… | |
+ (printf "%ge3\t" $$P; ../cngf-pf/shear_flux <strain_di… | |
echo sediment_flux_v$${v}ms.txt; \ | |
done; done' | |
t@@ -94,7 +96,9 @@ sediment_flux_freq1.157e-5s.txt: strain_distribution_ampl1Pa… | |
rm -f sediment_flux_freq*s.txt; \ | |
for freq in ${fluid_freq_vals}; do \ | |
for ampl in ${fluid_ampl_vals}; do \ | |
- (printf "%g\t" $$ampl; ../cngf-pf/shear_flux < strain_… | |
+ awk -v end=${time_end} "{printf \"%g\t%g\n\", $$1, $$1… | |
+ <strain_distribution_ampl$${ampl}Pa_freq$${fre… | |
+ (printf "%g\t" $$ampl; ../cngf-pf/shear_flux <strain_d… | |
echo sediment_flux_freq$${freq}s.txt; \ | |
done; done' | |