tUse Crank-Nicolson, consolidate syntax, improve BC comments - cngf-pf - contin… | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 6c1091d29c2c4b5519cd270a35c3dc427696bd50 | |
parent b613b1a585f2c6da10e0e9156d1ebe815a2b5fc9 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 28 Jun 2019 13:48:18 +0200 | |
Use Crank-Nicolson, consolidate syntax, improve BC comments | |
Diffstat: | |
M fluid.c | 8 ++++---- | |
1 file changed, 4 insertions(+), 4 deletions(-) | |
--- | |
diff --git a/fluid.c b/fluid.c | |
t@@ -71,8 +71,7 @@ darcy_pressure_change_1d(const int i, | |
const double beta_f, | |
const double mu_f) | |
{ | |
- double p, p_zn, p_zp, k_, div_k_grad_p; | |
- double k_zn, k_zp; | |
+ double p, p_zn, p_zp, k_, div_k_grad_p, k_zn, k_zp; | |
p = p_f_ghost_in[idx1g(i)]; | |
p_zn = p_f_ghost_in[idx1g(i-1)]; | |
t@@ -113,7 +112,7 @@ darcy_solver_1d(struct simulation* sim, | |
* epsilon = 0.0: explicit | |
* epsilon = 0.5: Crank-Nicolson | |
* epsilon = 1.0: implicit */ | |
- epsilon = 0.5; | |
+ epsilon = 0.5; | |
/* choose relaxation factor, parameter in ]0.0; 1.0] | |
* theta in ]0.0; 1.0]: underrelaxation | |
t@@ -128,7 +127,7 @@ darcy_solver_1d(struct simulation* sim, | |
sim->p_f_mod_phase, | |
sim->p_f_top); | |
- /* set fluid BCs */ | |
+ /* set fluid BCs (1 of 2) */ | |
set_bc_dirichlet(sim->p_f_ghost, sim->nz, +1, p_f_top); | |
sim->p_f_ghost[idx1g(sim->nz-1)] = p_f_top; /* Include top node in BC … | |
set_bc_neumann(sim->p_f_ghost, sim->nz, -1); | |
t@@ -152,6 +151,7 @@ darcy_solver_1d(struct simulation* sim, | |
r_norm = zeros(sim->nz); | |
for (iter=0; iter<max_iter; ++iter) { | |
+ /* set fluid BCs (2 of 2) */ | |
set_bc_dirichlet(sim->p_f_ghost, sim->nz, +1, p_f_top); | |
sim->p_f_ghost[idx1g(sim->nz-1)] = p_f_top; /* Include top nod… | |
set_bc_neumann(sim->p_f_ghost, sim->nz, -1); |