tMakefile: treat all pressure values as kPa - hansen-zoet-exp - comparison of l… | |
git clone git://src.adamsgaard.dk/hansen-zoet-exp | |
Log | |
Files | |
Refs | |
Submodules | |
--- | |
commit 41333bc4967ccb758fe4c122024dfede76a11670 | |
parent 1980c89641cb7b9a13bcbbff382e2abf38d0ad8e | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 10 Jun 2022 11:36:01 +0200 | |
Makefile: treat all pressure values as kPa | |
Diffstat: | |
M Makefile | 14 +++++++------- | |
1 file changed, 7 insertions(+), 7 deletions(-) | |
--- | |
diff --git a/Makefile b/Makefile | |
t@@ -12,7 +12,7 @@ stressvals_ != range -l -N 40 0.01 100 | |
stressvals_ += 8 22 50 | |
stressvals != echo ${stressvals_} | sort -n | |
velvals = 3.169e-6 9.506e-6 | |
-fluid_ampl_vals != range -N 4 1e3 10e3 | |
+fluid_ampl_vals != range -N 4 1 10 | |
fluid_freq_vals = 1.157e-5 # daily | |
grain_size = 530.7e-6 | |
grain_friction = 0.6 | |
t@@ -69,9 +69,9 @@ strain_distribution_ampl1Pa_freq1.157e-5s.txt: ${BIN} | |
-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;… | |
+ -a $${ampl}e3 \ | |
+ strain_distribution_ampl$${ampl}kPa_freq$${freq}s \ | |
+ >strain_distribution_ampl$${ampl}kPa_freq$${freq}s.txt… | |
done; done' | |
mohr_coulomb_v3.169e-6ms.txt: strain_distribution_N50kPa_v3.169e-6ms.txt | |
t@@ -91,14 +91,14 @@ sediment_flux_v3.169e-6ms.txt: strain_distribution_N50kPa_… | |
echo sediment_flux_v$${v}ms.txt; \ | |
done; done' | |
-sediment_flux_freq1.157e-5s.txt: strain_distribution_ampl1Pa_freq1.157e-5s.txt… | |
+sediment_flux_freq1.157e-5s.txt: strain_distribution_ampl1kPa_freq1.157e-5s.tx… | |
sh -c '\ | |
rm -f sediment_flux_freq*s.txt; \ | |
for freq in ${fluid_freq_vals}; do \ | |
for ampl in ${fluid_ampl_vals}; do \ | |
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… | |
+ <strain_distribution_ampl$${ampl}kPa_freq$${fr… | |
+ (printf "%g\t" $$ampl; ../cngf-pf/shear_flux <strain_d… | |
echo sediment_flux_freq$${freq}s.txt; \ | |
done; done' | |