tfix sign case error in ad92a3e - cngf-pf - continuum model for granular flows … | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit e7c73faa313ade214e2bdf211d0a913b6d0c2942 | |
parent 52e50485fc2d2791a52be357ab9f2a29103b5254 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 16 Feb 2021 15:37:06 +0100 | |
fix sign case error in ad92a3e | |
also fix minor whitespace issues | |
Diffstat: | |
M simulation.c | 6 +++--- | |
1 file changed, 3 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/simulation.c b/simulation.c | |
t@@ -900,7 +900,7 @@ find_flux(const struct simulation *sim) | |
void | |
set_coupled_fluid_transient_timestep(struct simulation *sim, const double safe… | |
{ | |
- double max_gamma_dot, mu, xi, max_i, t_val; | |
+ double max_gamma_dot, mu, xi, max_I, t_val; | |
/* max expected strain rate */ | |
max_gamma_dot = 1.0/sim->d; | |
t@@ -914,7 +914,7 @@ set_coupled_fluid_transient_timestep(struct simulation *si… | |
/ (sim->P_wall - sim->p_f_top))) | |
+ sim->dilatancy_constant * sim->phi[sim->nz-1]; | |
- /* estimate for cooperativity length */ | |
+ /* estimate for cooperativity length */ | |
xi = cooperativity_length(sim->A, | |
sim->d, | |
mu, | |
t@@ -925,7 +925,7 @@ set_coupled_fluid_transient_timestep(struct simulation *si… | |
/* max expected inertia number */ | |
max_I = max_gamma_dot * sim->d | |
/ sqrt((sim->sigma_n[sim->nz - 1] - sim->p_f_mod_ampl) / sim->… | |
- t_val = xi * (sim->alpha + sim->phi[sim->nz - 1]*sim->beta_f) * sim->m… | |
+ t_val = xi * (sim->alpha + sim->phi[sim->nz - 1] * sim->beta_f) * sim-… | |
/ (sim->phi[sim->nz - 1] * sim->phi[sim->nz - 1] | |
* sim->phi[sim->nz - 1] * sim->L_z * max_I); | |