tAllow --normalize option with fluid-enabled simulations - cngf-pf - continuum model for granular flows with pore-pressure dynamics (renamed from 1d_fd_simple_shear)
(HTM) git clone git://src.adamsgaard.dk/cngf-pf
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 8e120cffa8aad6b9eab4ff77a4dfdc0ab5402dd2
(DIR) parent c0f53ef2052ce364a01ceca5bf50ac7c21f7d1a6
(HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Tue, 25 Jun 2019 16:10:50 +0200
Allow --normalize option with fluid-enabled simulations
Diffstat:
M main.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/main.c b/main.c
t@@ -308,18 +308,21 @@ int main(int argc, char* argv[])
}
}
- if (normalize)
- print_arrays_2nd_normalized(sim.z, sim.v_x, sim.nz);
+ if (normalize) {
+ double max_v_x = max(sim.v_x, sim.nz);
+ for (int i=0; i<sim.nz; ++i)
+ sim.v_x[i] /= max_v_x;
+ }
+
+ if (sim.fluid)
+ for (int i=0; i<sim.nz; ++i)
+ printf("%.17g\t%.17g\t%.17g\t%.17g\n",
+ sim.z[i],
+ sim.v_x[i],
+ sim.sigma_n_eff[i],
+ sim.p_f_ghost[idx1g(i)]);
else
- if (sim.fluid)
- for (int i=0; i<sim.nz; ++i)
- printf("%.17g\t%.17g\t%.17g\t%.17g\n",
- sim.z[i],
- sim.v_x[i],
- sim.sigma_n_eff[i],
- sim.p_f_ghost[idx1g(i)]);
- else
- print_three_arrays(sim.z, sim.v_x, sim.sigma_n_eff, sim.nz);
+ print_three_arrays(sim.z, sim.v_x, sim.sigma_n_eff, sim.nz);
free_arrays(&sim);
return 0;