 |
tMakefile: do not run pressure-oscillation tests in subshell - hansen-zoet-exp … |
 |
git clone git://src.adamsgaard.dk/hansen-zoet-exp |
 |
Log |
|
Files |
|
Refs |
|
Submodules |
|
--- |
|
commit 531fcdc4289d0b7b5fbeea982d8b2c266917b9cd |
|
parent 3c1823c1dfda25deb485bfd1290a023790c29ade |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Mon, 13 Jun 2022 13:17:45 +0200 |
|
|
|
Makefile: do not run pressure-oscillation tests in subshell |
|
|
|
Diffstat: |
|
M Makefile | 14 ++++++-------- |
|
|
|
1 file changed, 6 insertions(+), 8 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 1 10 |
|
+fluid_ampl_vals != range -N 4 1 100 |
|
fluid_freq_vals = 1.157e-5 # daily |
|
grain_size = 530.7e-6 |
|
grain_friction = 0.6 |
|
t@@ -26,7 +26,7 @@ grain_rate_dependence = 0.002 |
|
time_end = 345600 |
|
time_interval = 1800 |
|
|
|
-default: ${PDFS} strain_distribution_ampl1kPa_freq1.157e-5s.txt |
|
+default: ${PDFS} sediment_flux_freq1.157e-5s.txt |
|
|
|
${BIN}: ${REPO}/cngf-pf.c |
|
CFLAGS="-march=native -O3 -pipe" make -C ${REPO} |
|
t@@ -92,15 +92,13 @@ sediment_flux_v3.169e-6ms.txt: strain_distribution_N50kPa_… |
|
done; done' |
|
|
|
sediment_flux_freq1.157e-5s.txt: strain_distribution_ampl1kPa_freq1.157e-5s.txt |
|
- sh -c '\ |
|
- rm -f sediment_flux_freq*s.txt; \ |
|
+ 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… |
|
+ awk -v time_end=${time_end} '{printf "%g\t%g\n", $$1, … |
|
<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' |
|
+ (printf '%g\t' $$ampl; ../cngf-pf/shear_flux <strain_d… |
|
+ done; done |
|
|
|
fig-strain_distribution.pdf: fig-strain_distribution.gp strain_distribution_N5… |
|
gnuplot fig-strain_distribution.gp > $@ |
