 |
tFix whitespace in many alignment indentations - cngf-pf - continuum model for … |
 |
git clone git://src.adamsgaard.dk/cngf-pf |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit d161a2d9a8021dc7f610f0538d58785afe469bd8 |
|
parent acdbcf9f62ea77446dd293b42f9380ad33e83f19 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Thu, 16 Apr 2020 14:02:28 +0200 |
|
|
|
Fix whitespace in many alignment indentations |
|
|
|
Diffstat: |
|
M fluid.c | 2 +- |
|
M simulation.c | 21 +++++++++++---------- |
|
|
|
2 files changed, 12 insertions(+), 11 deletions(-) |
|
--- |
|
diff --git a/fluid.c b/fluid.c |
|
t@@ -30,7 +30,7 @@ set_largest_fluid_timestep(struct simulation *sim, const dou… |
|
for (i=0; i<sim->nz-1; ++i) { |
|
if (dx[i] < 0.0) { |
|
fprintf(stderr, "error: cell spacing negative (%g) in … |
|
- dx[i], i); |
|
+ dx[i], i); |
|
free(dx); |
|
return 1; |
|
} |
|
diff --git a/simulation.c b/simulation.c |
|
t@@ -234,7 +234,7 @@ check_simulation_parameters(struct simulation *sim) |
|
check_float("sim->mu_wall", sim->mu_wall, &return_status); |
|
if (sim->mu_wall < 0.0) |
|
warn_parameter_value("sim->mu_wall is negative", sim->mu_wall, |
|
- &return_status); |
|
+ &return_status); |
|
|
|
check_float("sim->A", sim->A, &return_status); |
|
if (sim->A < 0.0) |
|
t@@ -451,7 +451,8 @@ compute_permeability(struct simulation *sim) |
|
int i; |
|
for (i=0; i<sim->nz; ++i) |
|
sim->k[i] = pow(sim->d, 2.0)/180.0 |
|
- *pow(sim->phi[i], 3.0)/pow(1.0 - sim->phi[i], 2.0); |
|
+ *pow(sim->phi[i], 3.0) |
|
+ /pow(1.0 - sim->phi[i], 2.0); |
|
} |
|
|
|
/* NEW FUNCTIONS END */ |
|
t@@ -558,10 +559,10 @@ compute_local_fluidity(struct simulation *sim) |
|
sim->g_local[i] = local_fluidity(sim->sigma_n_eff[i], |
|
sim->mu[i], |
|
sim->mu_s, |
|
- … |
|
- … |
|
- … |
|
- … |
|
+ sim->C, |
|
+ sim->b, |
|
+ sim->rho_s, |
|
+ sim->d); |
|
} |
|
|
|
void |
|
t@@ -617,7 +618,7 @@ poisson_solver_1d_cell_update(int i, |
|
|
|
coorp_term = dz*dz/(2.0*pow(xi[i], 2.0)); |
|
g_out[i+1] = 1.0/(1.0 + coorp_term) |
|
- *(coorp_term*g_local[i] + g_in[i+2]/2.0 + g_i… |
|
+ *(coorp_term*g_local[i] + g_in[i+2]/2.0 + g_in[i]/2.0); |
|
|
|
r_norm[i] = pow(g_out[i+1] - g_in[i+1], 2.0) |
|
/(pow(g_out[i+1], 2.0) + 1e-16); |
|
t@@ -659,7 +660,7 @@ implicit_1d_jacobian_poisson_solver(struct simulation *sim, |
|
for (i=0; i<sim->nz; ++i) |
|
poisson_solver_1d_cell_update(i, |
|
sim->g_ghost, |
|
- … |
|
+ sim->g_local, |
|
g_ghost_out, |
|
r_norm, |
|
sim->dz, |
|
t@@ -790,8 +791,8 @@ coupled_shear_solver(struct simulation *sim, |
|
|
|
/* step 8, Eq. 11 */ |
|
if (implicit_1d_jacobian_poisson_solver(sim, |
|
- … |
|
- … |
|
+ MAX_ITER_GRANU… |
|
+ RTOL_GRANULAR)) |
|
exit(12); |
|
|
|
/* step 9 */ |
