commit 3345209e2b7226a89a93d53327c580f6a3200beb
parent 4aa63daf85b52b49566be12c37daa5da6abf280b
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Tue, 7 Apr 2020 13:33:19 +0200
Show specific flux as m2/a, update 1d_fd_simple_shear
Diffstat:
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/flux_estimate/Makefile b/flux_estimate/Makefile
@@ -27,6 +27,7 @@ steady_flux: steady.txt
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"
@@ -46,6 +47,7 @@ variable_flux: variable.output00095.txt
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"
@@ -65,6 +67,7 @@ variable_flux_hi: variable_hi.output00095.txt
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"
