tstyle fixes for e416cbbbc45454688a91db2ec0ebedd4ed7afd71 - cngf-pf - continuum… | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 2da21de29312aadc32730e77ab00412e45f846b5 | |
parent e416cbbbc45454688a91db2ec0ebedd4ed7afd71 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 12 Aug 2021 13:20:49 +0200 | |
style fixes for e416cbbbc45454688a91db2ec0ebedd4ed7afd71 | |
Diffstat: | |
M fluid.c | 57 +++++++++++++++++------------… | |
M simulation.c | 10 ++++++---- | |
2 files changed, 38 insertions(+), 29 deletions(-) | |
--- | |
diff --git a/fluid.c b/fluid.c | |
t@@ -180,7 +180,7 @@ darcy_pressure_change_1d_impl(const int i, | |
const double mu_f, | |
const double D) | |
{ | |
- double k_, div_k_grad_p, k_zn, k_zp,rhs_term; | |
+ double k_, div_k_grad_p, k_zn, k_zp, rhs_term; | |
double omega = 1.0; | |
if (D > 0.0) | |
t@@ -197,20 +197,26 @@ darcy_pressure_change_1d_impl(const int i, | |
k_zp = k_; | |
else | |
k_zp = k[i + 1]; | |
- rhs_term = dt / ((alpha + beta_f * phi[i]) * mu_f) * ((2.0 * k_zp * k_ / (… | |
- p_f_ghost_out[i+1] = (1 / (1.0 + rhs_term)) * (p_f_old_val[i+1] + dt* (1.… | |
- (2.0 * k_zp * k_ / (k_zp + k_) | |
- * (p_f_ghost_in[i + 2]) / dz | |
- - 2.0 * k_zn * k_ / (k_zn + k_) | |
- * ( - p_f_ghost_in[i]) / dz)/dz | |
- - 1.0 / ((alpha + beta_f * phi[i]) * (1.0 - phi[i])) * … | |
- p_f_ghost_out[i+1] = omega * p_f_ghost_out[i+1] + (1.0-omega)*… | |
+ | |
+ rhs_term = dt / ((alpha + beta_f * phi[i]) * mu_f) | |
+ * ((2.0 * k_zp * k_ / (k_zp + k_) / (dz * dz)) | |
+ + (2.0 * k_zn * k_ / (k_zn + k_) / (dz * dz))); | |
+ | |
+ p_f_ghost_out[i + 1] = 1.0 / (1.0 + rhs_term) | |
+ * (p_f_old_val[i + 1] + dt | |
+ * (1.0 / ((alpha + beta_f * phi[i]) * m… | |
+ * (2.0 * k_zp * k_ / (k_zp + k_) | |
+ * (p_f_ghost_in[i + 2]) / dz | |
+ - 2.0 * k_zn * k_ / (k_zn + k_) | |
+ * ( - p_f_ghost_in[i]) / dz) / dz | |
+ - 1.0 / ((alpha + beta_f * phi[i]) * (1… | |
+ p_f_ghost_out[i+1] = omega * p_f_ghost_out[i + 1] + (1.0 - ome… | |
div_k_grad_p = (2.0 * k_zp * k_ / (k_zp + k_) | |
- * (p_f_ghost_out[i + 2] - p_f_ghost_out[i + 1]… | |
- - 2.0 * k_zn * k_ / (k_zn + k_) | |
- * (p_f_ghost_out[i + 1] - p_f_ghost_out[i]) / … | |
-) / dz; | |
+ * (p_f_ghost_out[i + 2] - p_f_ghost_out[i + 1… | |
+ - 2.0 * k_zn * k_ / (k_zn + k_) | |
+ * (p_f_ghost_out[i + 1] - p_f_ghost_out[i]) /… | |
+ ) / dz; | |
#ifdef DEBUG | |
printf("%s [%d]: phi=%g\tdiv_k_grad_p=%g\tphi_dot=%g\n", | |
__func__, i, phi[i], div_k_grad_p, phi_dot[i]); | |
t@@ -220,7 +226,7 @@ darcy_pressure_change_1d_impl(const int i, | |
p_f_ghost_in[i], p_f_ghost_in[i + 1], p_f_ghost_in[i + … | |
k_zn, k_, k_zp); | |
#endif | |
- /* use the values from the next time step as the time derivative for this … | |
+ /* use the values from the next time step as the time derivati… | |
return 1.0 / ((alpha + beta_f * phi[i]) * mu_f) * div_k_grad_p | |
- 1.0 / ((alpha + beta_f * phi[i]) * (1.0 - phi[i])) * … | |
} | |
t@@ -294,16 +300,17 @@ darcy_solver_1d(struct simulation *sim, | |
/* implicit solution with Jacobian iterations */ | |
if (epsilon > 0.0) { | |
- /* grabbing the n + 1 iteration values for k and phi */ | |
- double * k_n; | |
- double * phi_n; | |
- k_n = zeros(sim->nz); | |
- phi_n = zeros(sim->nz); | |
- for (i = 0; i < sim->nz; ++i) { | |
- phi_n[i] = sim->phi[i] + sim->dt*sim->phi_dot[i]; | |
+ | |
+ /* grabbing the n + 1 iteration values for k and phi */ | |
+ double * k_n; | |
+ double * phi_n; | |
+ k_n = zeros(sim->nz); | |
+ phi_n = zeros(sim->nz); | |
+ for (i = 0; i < sim->nz; ++i) { | |
+ phi_n[i] = sim->phi[i] + sim->dt*sim->phi_dot[i]; | |
k_n[i] = sim->d * sim->d / 180.0 | |
- * phi_n[i] * phi_n[i] * phi_n[i] | |
- / pow(1.0 - phi_n[i], 2.0); | |
+ * phi_n[i] * phi_n[i] * phi_n[i] | |
+ / pow(1.0 - phi_n[i], 2.0); | |
} | |
#ifdef DEBUG | |
printf("\nEXPLICIT SOLVER IN %s\n", __func__); | |
t@@ -330,7 +337,7 @@ darcy_solver_1d(struct simulation *sim, | |
sim->p_f_dot_impl[i] = darcy_pressure_change_1… | |
… | |
… | |
- sim-… | |
+ … | |
… | |
… | |
… | |
t@@ -372,7 +379,7 @@ darcy_solver_1d(struct simulation *sim, | |
if (!solved) { | |
fprintf(stderr, "darcy_solver_1d: "); | |
fprintf(stderr, "Solution did not converge after %d it… | |
- iter); | |
+ iter); | |
fprintf(stderr, ".. Residual normalized error: %f\n", … | |
} | |
} else { | |
diff --git a/simulation.c b/simulation.c | |
t@@ -48,7 +48,7 @@ init_sim(struct simulation *sim) | |
/* sim->mu_s = 0.3819; */ | |
/* sim->C = 0.0; */ | |
/* Testing */ | |
- sim->mu_s = 0.30; | |
+ sim->mu_s = 0.30; | |
/* Damsgaard et al 2013 */ | |
/*sim->mu_s = tan(DEG2RAD(22.0)); */ | |
sim->C = 0.0; | |
t@@ -544,9 +544,11 @@ compute_effective_stress(struct simulation *sim) | |
if (sim->fluid) | |
for (i = 0; i < sim->nz; ++i) { | |
- /* average of current and next step pressure values for effe… | |
- sim->sigma_n_eff[i] = sim->sigma_n[i] - ((sim->p_f_gho… | |
- //sim->sigma_n_eff[i] = sim->sigma_n[i] - sim->p_f_gho… | |
+ /* average of current and next step pressure values fo… | |
+ sim->sigma_n_eff[i] = sim->sigma_n[i] | |
+ - ((sim->p_f_ghost[i + 1] + sim-… | |
+ / 2.0); | |
+ /* sim->sigma_n_eff[i] = sim->sigma_n[i] - sim->p_f_gh… | |
if (sim->sigma_n_eff[i] < 0) | |
errx(1, "%s: sigma_n_eff[%d] is negative with … | |
__func__, i, sim->sigma_n_eff[i]); |