rtx-cfd: PISO validated by manufactured solution — after fixing the inverted projection
Performance Benchmarks / Run Benchmarks (push) Canceled after 0s
CI / Format Check (push) Canceled after 0s
CI / Clippy Check (push) Canceled after 0s
CI / Build (macos-latest) (push) Canceled after 0s
CI / Build (ubuntu-latest) (push) Canceled after 0s
CI / Test (macos-latest) (push) Canceled after 0s
CI / Test (ubuntu-latest) (push) Canceled after 0s
CI / Build CPU-Only (Explicit) (push) Canceled after 0s
CI / Python Bindings (maturin) (macos-latest) (push) Canceled after 0s
CI / Python Bindings (maturin) (ubuntu-latest) (push) Canceled after 0s
CI / WASM Build + Size Check (push) Canceled after 0s
CI / Distributed Training Tests (push) Canceled after 0s
CI / CI Success (push) Canceled after 0s
Documentation / Build API Documentation (push) Canceled after 0s
Documentation / Build User Guide (push) Canceled after 0s

PisoSolver was the only major solver in the workspace with no verification
of any kind. Writing the MMS harness for it (tests/mms_piso.rs) and
inspecting the implementation found the census's defect species again:

- The pressure correction had its SIGN inverted: it solved
  -lap(p') = +rho div(u*)/dt and then corrected with u = u* - (dt/rho)
  grad(p'), so each projection DOUBLED the divergence instead of removing
  it.
- The momentum sweeps froze the near-wall lines (1..ny-1) and the pressure
  correction skipped the outer ring of cells (1..nx-1) — both exactly the
  defects repaired in SIMPLE.
- The "explicit" predictor read neighbours the same sweep had already
  overwritten, so the step depended on sweep order.
- The pressure gradient was dropped entirely on the last interior face.

Rewritten as a genuinely explicit predictor plus anchored-Neumann
projection on the staggered grid, with the conventions SIMPLE now embodies:
near-wall lines are unknowns with half-cell wall diffusion, continuity on
every cell, boundary faces are prescribed data. Momentum-source and
wall-velocity hooks added so the manufactured solution can reach it.

Measured (16 -> 32 -> 64): L2 velocity 3.516214e-2, 1.953750e-2,
1.037512e-2 — orders 0.85 and 0.91, first-order upwind's rate — with
max |div u| ~ 1e-9 in every cell. The errors agree with SIMPLE's on the
same meshes to six or seven significant figures: an implicit under-relaxed
outer iteration and an explicit time-marching projection land on the same
discrete steady solution, which is what sharing a spatial discretisation
must produce and is very hard for two independently wrong solvers to fake.

285 tests, 0 failing.

Co-Authored-By: Claude Fable 5 <[email protected]>
This commit is contained in:
Omar Sobh
2026-08-19 19:28:39 -07:00
co-authored by Claude Fable 5
parent 796cf173e6
commit 9b097fca0d
2 changed files with 528 additions and 388 deletions
@@ -1,8 +1,41 @@
//! PISO (Pressure-Implicit with Splitting of Operators) algorithm
//!
//! The PISO algorithm is a non-iterative pressure-velocity coupling algorithm
//! particularly well-suited for transient flow problems. It consists of one
//! predictor step followed by two or more corrector steps.
//! A transient pressure-velocity coupling method: one explicit momentum
//! predictor per time step, followed by pressure-correction (projection)
//! steps that make the velocity field divergence-free. Marching it in time
//! with a steady forcing converges to the steady discrete solution, which is
//! how `tests/mms_piso.rs` verifies it against a manufactured solution.
//!
//! # Grid convention
//!
//! The staggered layout is the one `FlowField` and the SIMPLE solver define:
//! `u[(j, i)]` lives at `(i dx, (j + 0.5) dy)` for `i = 0..=nx`, `v[(j, i)]`
//! at `((i + 0.5) dx, j dy)` for `j = 0..=ny`, `p[(j, i)]` at cell centres.
//! The only velocity components on a domain boundary are the normal ones —
//! u faces `i = 0`, `i = nx` and v faces `j = 0`, `j = ny`. Everything else,
//! including the near-wall lines, is an unknown and is updated every step.
//!
//! # History
//!
//! The previous implementation had never had a test of any kind, and
//! inspection plus the manufactured-solution harness found the same defect
//! species the SIMPLE census recorded:
//!
//! - **The pressure correction had its sign inverted.** It solved
//! `-lap(p') = +rho div(u*) / dt` and then corrected with
//! `u = u* - (dt/rho) grad(p')`, so each projection *doubled* the
//! divergence instead of removing it.
//! - The momentum sweeps froze the near-wall lines (`1..ny-1`), imposing the
//! wall half a cell inside the domain, and the pressure correction skipped
//! the outer ring of cells (`1..nx-1`), so ring cells had no continuity
//! equation — both exactly as in SIMPLE before its repair.
//! - The predictor read neighbours that the same sweep had already
//! overwritten, so the "explicit" step mixed old and new values in sweep
//! order.
//! - The pressure gradient was dropped entirely on the last interior face
//! (`if i < nx - 1 { ... } else { 0.0 }`).
//! - Convective face fluxes fell back to the centre value at the sweep edges
//! instead of using the prescribed boundary faces that exist there.
use super::{BoundaryConditions, FlowField, IncompressibleSolver, SolverResult};
use crate::{CfdConfig, CfdResult};
@@ -11,11 +44,15 @@ use async_trait::async_trait;
/// Parameters for PISO algorithm
#[derive(Debug, Clone)]
pub struct PisoParameters {
/// Number of corrector steps (typically 2-3)
/// Number of corrector steps (typically 2-3). With an explicit predictor
/// the first projection already removes the divergence; the extra
/// correctors are cheap no-ops kept for the algorithm's shape.
pub corrector_steps: usize,
/// Time step size
/// Time step size. The predictor is explicit, so stability requires
/// `dt < dx^2 / (4 nu)` and `dt < dx / |u|_max`.
pub time_step: f64,
/// Convergence tolerance
/// Convergence tolerance on the normalised mass imbalance after
/// correction.
pub tolerance: f64,
}
@@ -42,6 +79,18 @@ pub struct PisoResult {
pub struct PisoSolver {
config: CfdConfig,
parameters: PisoParameters,
/// Optional volumetric momentum source `f(x, y) -> (f_x, f_y)`, per unit
/// volume — the hook a manufactured solution enters through, exactly as
/// on [`super::SimpleSolver`].
#[allow(clippy::type_complexity)]
momentum_source: Option<Box<dyn Fn(f64, f64) -> (f64, f64) + Send + Sync>>,
/// Optional wall velocity `f(x, y) -> (u_wall, v_wall)`, sampled at the
/// wall face position. The near-wall control volumes need the tangential
/// wall velocity for their half-cell diffusion term, and on this
/// staggered layout there is nowhere to store it. Falls back to the value
/// on the near-wall line itself when unset.
#[allow(clippy::type_complexity)]
wall_velocity: Option<Box<dyn Fn(f64, f64) -> (f64, f64) + Send + Sync>>,
}
impl PisoSolver {
@@ -49,442 +98,336 @@ impl PisoSolver {
pub fn new(config: CfdConfig, parameters: PisoParameters) -> CfdResult<Self> {
config.validate()?;
Ok(Self { config, parameters })
Ok(Self {
config,
parameters,
momentum_source: None,
wall_velocity: None,
})
}
/// Solve momentum predictor step
/// Discretize: ∂u/∂t + ∇·(u⊗u) = -∇p^n/ρ + ν∇²u
fn solve_momentum_predictor(
&self,
flow_field: &mut FlowField,
dt: f64,
rho: f64,
nu: f64,
) -> CfdResult<()> {
let (_nx, _ny, dx, dy) = flow_field.grid_info();
// Solve u-momentum equation
self.solve_u_momentum(flow_field, dt, rho, nu, dx, dy)?;
// Solve v-momentum equation
self.solve_v_momentum(flow_field, dt, rho, nu, dx, dy)?;
// Store predicted velocities
flow_field.copy_to_starred();
Ok(())
/// Set a volumetric momentum source. See [`Self::momentum_source`].
pub fn set_momentum_source<F>(&mut self, source: F)
where
F: Fn(f64, f64) -> (f64, f64) + Send + Sync + 'static,
{
self.momentum_source = Some(Box::new(source));
}
/// Solve u-momentum equation using finite volume method
fn solve_u_momentum(
&self,
flow_field: &mut FlowField,
dt: f64,
rho: f64,
nu: f64,
dx: f64,
dy: f64,
) -> CfdResult<()> {
let (nx, ny, _, _) = flow_field.grid_info();
/// Set the wall velocity as a function of position. See
/// [`Self::wall_velocity`].
pub fn set_wall_velocity<F>(&mut self, f: F)
where
F: Fn(f64, f64) -> (f64, f64) + Send + Sync + 'static,
{
self.wall_velocity = Some(Box::new(f));
}
// For each u-velocity control volume (i+1/2, j)
for j in 1..(ny - 1) {
fn u_wall(&self, flow_field: &FlowField, i: usize, j: usize, y_wall: f64, dx: f64) -> f64 {
self.wall_velocity
.as_ref()
.map_or(flow_field.u_old[(j, i)], |f| f(i as f64 * dx, y_wall).0)
}
fn v_wall(&self, flow_field: &FlowField, i: usize, j: usize, x_wall: f64, dy: f64) -> f64 {
self.wall_velocity
.as_ref()
.map_or(flow_field.v_old[(j, i)], |f| f(x_wall, j as f64 * dy).1)
}
/// Upwind face value: the value carried across the face is the one from
/// the side the flow comes from.
fn upwind(face_velocity: f64, upstream: f64, downstream: f64) -> f64 {
if face_velocity >= 0.0 {
upstream
} else {
downstream
}
}
/// Explicit momentum predictor:
/// `u* = u_old + dt (-conv + nu lap(u) - grad(p)/rho + f/rho)`,
/// every term evaluated from `u_old`/`v_old`, so the step is genuinely
/// explicit and independent of sweep order.
fn momentum_predictor(&self, flow_field: &mut FlowField, dt: f64) -> CfdResult<()> {
let (nx, ny, dx, dy) = flow_field.grid_info();
let rho = self.config.density;
let nu = self.config.viscosity / rho;
// u faces: every row is an unknown; only i = 0 and i = nx are
// boundary data.
for j in 0..ny {
for i in 1..nx {
// Time derivative term: ∂u/∂t ≈ (u_new - u_old)/dt
let time_coeff = 1.0 / dt;
let time_source = flow_field.u_old[(j, i)] / dt;
let uo = &flow_field.u_old;
let vo = &flow_field.v_old;
let u_p = uo[(j, i)];
// Convective terms: ∇·(u⊗u)
// Face velocities for convection (interpolated)
let u_east = if i < nx - 1 {
0.5 * (flow_field.u[(j, i)] + flow_field.u[(j, i + 1)])
} else {
flow_field.u[(j, i)]
};
let u_west = if i > 1 {
0.5 * (flow_field.u[(j, i - 1)] + flow_field.u[(j, i)])
} else {
flow_field.u[(j, i)]
};
let _u_north = if j < ny - 1 {
0.5 * (flow_field.u[(j, i)] + flow_field.u[(j + 1, i)])
} else {
flow_field.u[(j, i)]
};
let _u_south = if j > 1 {
0.5 * (flow_field.u[(j - 1, i)] + flow_field.u[(j, i)])
} else {
flow_field.u[(j, i)]
};
// Cell-centre velocities on the east/west faces of the u
// control volume. The neighbours i-1 and i+1 always exist:
// they are boundary faces at the sweep edges, which hold
// prescribed data rather than needing a fallback.
let ue_face = 0.5 * (uo[(j, i)] + uo[(j, i + 1)]);
let uw_face = 0.5 * (uo[(j, i - 1)] + uo[(j, i)]);
// Transverse velocities
let v_north = if i > 0 && i < nx && j < ny {
0.5 * (flow_field.v[(j + 1, i - 1)] + flow_field.v[(j + 1, i)])
} else {
let south_is_wall = j == 0;
let north_is_wall = j + 1 == ny;
// Transverse face velocities; a solid wall passes no mass.
let vn_face = if north_is_wall {
0.0
};
let v_south = if i > 0 && i < nx && j > 0 {
0.5 * (flow_field.v[(j, i - 1)] + flow_field.v[(j, i)])
} else {
0.5 * (vo[(j + 1, i - 1)] + vo[(j + 1, i)])
};
let vs_face = if south_is_wall {
0.0
} else {
0.5 * (vo[(j, i - 1)] + vo[(j, i)])
};
// Convective fluxes (upwind scheme)
let conv_east = u_east
* if u_east > 0.0 {
flow_field.u[(j, i)]
} else if i < nx - 1 {
flow_field.u[(j, i + 1)]
let conv_x = (ue_face * Self::upwind(ue_face, uo[(j, i)], uo[(j, i + 1)])
- uw_face * Self::upwind(uw_face, uo[(j, i - 1)], uo[(j, i)]))
/ dx;
let conv_y = (vn_face
* if north_is_wall {
0.0
} else {
flow_field.u[(j, i)]
};
let conv_west = u_west
* if u_west > 0.0 {
if i > 1 {
flow_field.u[(j, i - 1)]
Self::upwind(vn_face, uo[(j, i)], uo[(j + 1, i)])
}
- vs_face
* if south_is_wall {
0.0
} else {
flow_field.u[(j, i)]
}
} else {
flow_field.u[(j, i)]
};
let conv_north = v_north
* if v_north > 0.0 {
flow_field.u[(j, i)]
} else if j < ny - 1 {
flow_field.u[(j + 1, i)]
} else {
flow_field.u[(j, i)]
};
let conv_south = v_south
* if v_south > 0.0 {
if j > 1 {
flow_field.u[(j - 1, i)]
} else {
flow_field.u[(j, i)]
}
} else {
flow_field.u[(j, i)]
};
Self::upwind(vs_face, uo[(j - 1, i)], uo[(j, i)])
})
/ dy;
let convection = (conv_east - conv_west) / dx + (conv_north - conv_south) / dy;
let diff_x = nu * (uo[(j, i + 1)] - 2.0 * u_p + uo[(j, i - 1)]) / (dx * dx);
// Diffusive terms: ν∇²u
let u_center = flow_field.u[(j, i)];
let u_east_diff = if i < nx - 1 {
flow_field.u[(j, i + 1)]
// Wall-adjacent diffusive fluxes act over half a cell: the
// node beyond the wall face is the wall itself, dy/2 away.
let flux_north = if north_is_wall {
nu * (self.u_wall(flow_field, i, j, ny as f64 * dy, dx) - u_p) / (0.5 * dy)
} else {
u_center
nu * (uo[(j + 1, i)] - u_p) / dy
};
let u_west_diff = if i > 1 {
flow_field.u[(j, i - 1)]
let flux_south = if south_is_wall {
nu * (u_p - self.u_wall(flow_field, i, j, 0.0, dx)) / (0.5 * dy)
} else {
u_center
};
let u_north_diff = if j < ny - 1 {
flow_field.u[(j + 1, i)]
} else {
u_center
};
let u_south_diff = if j > 1 {
flow_field.u[(j - 1, i)]
} else {
u_center
nu * (u_p - uo[(j - 1, i)]) / dy
};
let diff_y = (flux_north - flux_south) / dy;
let diffusion_x = (u_east_diff - 2.0 * u_center + u_west_diff) / (dx * dx);
let diffusion_y = (u_north_diff - 2.0 * u_center + u_south_diff) / (dy * dy);
let diffusion = nu * (diffusion_x + diffusion_y);
// The pressure gradient acts on every unknown face — dropping
// it anywhere solves a different equation there.
let pressure_gradient =
-(flow_field.p[(j, i)] - flow_field.p[(j, i - 1)]) / (rho * dx);
// Pressure gradient: -∂p/∂x / ρ (using pressure from previous time step)
let pressure_grad = if i < nx - 1 {
-(flow_field.p[(j, i)] - flow_field.p[(j, i - 1)]) / (rho * dx)
} else {
0.0
};
let body_force = self
.momentum_source
.as_ref()
.map_or(0.0, |f| f(i as f64 * dx, (j as f64 + 0.5) * dy).0 / rho);
// Source term
let source = time_source + diffusion + pressure_grad;
// Solve: (1/dt + convection_coeff) * u_new = source
let total_coeff = time_coeff;
flow_field.u[(j, i)] = (source - convection) / total_coeff;
flow_field.u[(j, i)] = u_p
+ dt * (-conv_x - conv_y + diff_x + diff_y + pressure_gradient + body_force);
}
}
Ok(())
}
/// Solve v-momentum equation using finite volume method
fn solve_v_momentum(
&self,
flow_field: &mut FlowField,
dt: f64,
rho: f64,
nu: f64,
dx: f64,
dy: f64,
) -> CfdResult<()> {
let (nx, ny, _, _) = flow_field.grid_info();
// For each v-velocity control volume (i, j+1/2)
// v faces, mirrored.
for j in 1..ny {
for i in 1..(nx - 1) {
// Time derivative term
let time_coeff = 1.0 / dt;
let time_source = flow_field.v_old[(j, i)] / dt;
for i in 0..nx {
let uo = &flow_field.u_old;
let vo = &flow_field.v_old;
let v_p = vo[(j, i)];
// Convective terms
let _v_east = if i < nx - 1 {
0.5 * (flow_field.v[(j, i)] + flow_field.v[(j, i + 1)])
} else {
flow_field.v[(j, i)]
};
let _v_west = if i > 1 {
0.5 * (flow_field.v[(j, i - 1)] + flow_field.v[(j, i)])
} else {
flow_field.v[(j, i)]
};
let v_north = if j < ny - 1 {
0.5 * (flow_field.v[(j, i)] + flow_field.v[(j + 1, i)])
} else {
flow_field.v[(j, i)]
};
let v_south = if j > 1 {
0.5 * (flow_field.v[(j - 1, i)] + flow_field.v[(j, i)])
} else {
flow_field.v[(j, i)]
};
let vn_face = 0.5 * (vo[(j, i)] + vo[(j + 1, i)]);
let vs_face = 0.5 * (vo[(j - 1, i)] + vo[(j, i)]);
// Transverse velocities
let u_east = if j > 0 && j < ny && i < nx - 1 {
0.5 * (flow_field.u[(j - 1, i + 1)] + flow_field.u[(j, i + 1)])
} else {
let west_is_wall = i == 0;
let east_is_wall = i + 1 == nx;
let ue_face = if east_is_wall {
0.0
};
let u_west = if j > 0 && j < ny && i > 0 {
0.5 * (flow_field.u[(j - 1, i)] + flow_field.u[(j, i)])
} else {
0.5 * (uo[(j - 1, i + 1)] + uo[(j, i + 1)])
};
let uw_face = if west_is_wall {
0.0
} else {
0.5 * (uo[(j - 1, i)] + uo[(j, i)])
};
// Convective fluxes (upwind)
let conv_east = u_east
* if u_east > 0.0 {
flow_field.v[(j, i)]
} else if i < nx - 1 {
flow_field.v[(j, i + 1)]
let conv_y = (vn_face * Self::upwind(vn_face, vo[(j, i)], vo[(j + 1, i)])
- vs_face * Self::upwind(vs_face, vo[(j - 1, i)], vo[(j, i)]))
/ dy;
let conv_x = (ue_face
* if east_is_wall {
0.0
} else {
flow_field.v[(j, i)]
};
let conv_west = u_west
* if u_west > 0.0 {
if i > 1 {
flow_field.v[(j, i - 1)]
Self::upwind(ue_face, vo[(j, i)], vo[(j, i + 1)])
}
- uw_face
* if west_is_wall {
0.0
} else {
flow_field.v[(j, i)]
}
} else {
flow_field.v[(j, i)]
};
let conv_north = v_north
* if v_north > 0.0 {
flow_field.v[(j, i)]
} else if j < ny - 1 {
flow_field.v[(j + 1, i)]
} else {
flow_field.v[(j, i)]
};
let conv_south = v_south
* if v_south > 0.0 {
if j > 1 {
flow_field.v[(j - 1, i)]
} else {
flow_field.v[(j, i)]
}
} else {
flow_field.v[(j, i)]
};
Self::upwind(uw_face, vo[(j, i - 1)], vo[(j, i)])
})
/ dx;
let convection = (conv_east - conv_west) / dx + (conv_north - conv_south) / dy;
let diff_y = nu * (vo[(j + 1, i)] - 2.0 * v_p + vo[(j - 1, i)]) / (dy * dy);
// Diffusive terms
let v_center = flow_field.v[(j, i)];
let v_east_diff = if i < nx - 1 {
flow_field.v[(j, i + 1)]
let flux_east = if east_is_wall {
nu * (self.v_wall(flow_field, i, j, nx as f64 * dx, dy) - v_p) / (0.5 * dx)
} else {
v_center
nu * (vo[(j, i + 1)] - v_p) / dx
};
let v_west_diff = if i > 1 {
flow_field.v[(j, i - 1)]
let flux_west = if west_is_wall {
nu * (v_p - self.v_wall(flow_field, i, j, 0.0, dy)) / (0.5 * dx)
} else {
v_center
};
let v_north_diff = if j < ny - 1 {
flow_field.v[(j + 1, i)]
} else {
v_center
};
let v_south_diff = if j > 1 {
flow_field.v[(j - 1, i)]
} else {
v_center
nu * (v_p - vo[(j, i - 1)]) / dx
};
let diff_x = (flux_east - flux_west) / dx;
let diffusion_x = (v_east_diff - 2.0 * v_center + v_west_diff) / (dx * dx);
let diffusion_y = (v_north_diff - 2.0 * v_center + v_south_diff) / (dy * dy);
let diffusion = nu * (diffusion_x + diffusion_y);
let pressure_gradient =
-(flow_field.p[(j, i)] - flow_field.p[(j - 1, i)]) / (rho * dy);
// Pressure gradient: -∂p/∂y / ρ
let pressure_grad = if j < ny - 1 {
-(flow_field.p[(j, i)] - flow_field.p[(j - 1, i)]) / (rho * dy)
} else {
0.0
};
let body_force = self
.momentum_source
.as_ref()
.map_or(0.0, |f| f((i as f64 + 0.5) * dx, j as f64 * dy).1 / rho);
let source = time_source + diffusion + pressure_grad;
let total_coeff = time_coeff;
flow_field.v[(j, i)] = (source - convection) / total_coeff;
flow_field.v[(j, i)] = v_p
+ dt * (-conv_x - conv_y + diff_x + diff_y + pressure_gradient + body_force);
}
}
flow_field.copy_to_starred();
Ok(())
}
/// Solve pressure correction equation
/// ∇²p' = ρ∇·u*/dt
fn solve_pressure_correction(
&self,
flow_field: &mut FlowField,
dt: f64,
rho: f64,
dx: f64,
dy: f64,
) -> CfdResult<f64> {
let (nx, ny, _, _) = flow_field.grid_info();
/// One projection: solve the pressure-correction Poisson equation and
/// subtract `(dt/rho) grad(p')` from the predicted velocities, so the
/// corrected field is discretely divergence-free.
///
/// Continuity is enforced on every cell. A coefficient is zero exactly
/// when its face is a domain boundary, where the normal velocity is
/// prescribed and not correctable. With velocity prescribed on the whole
/// boundary the system is pure Neumann; one cell is anchored to fix the
/// level, which is legitimate because the source telescopes to the net
/// boundary flux — zero for a closed box — so exactly one equation is
/// redundant.
///
/// Returns the normalised mass imbalance of the *corrected* field — what
/// the projection failed to remove, which is the inner solver's
/// truncation and is the step's honest convergence measure.
fn project(&self, flow_field: &mut FlowField, dt: f64) -> CfdResult<f64> {
let (nx, ny, dx, dy) = flow_field.grid_info();
let rho = self.config.density;
// Reset pressure correction
flow_field.p_prime.fill(0.0);
// Iterative solution using Gauss-Seidel
let mut max_residual = 0.0;
// Mass imbalance of the predicted field, per cell, as a flux.
for j in 0..ny {
for i in 0..nx {
let divergence_flux = rho
* ((flow_field.u_star[(j, i + 1)] - flow_field.u_star[(j, i)]) * dy
+ (flow_field.v_star[(j + 1, i)] - flow_field.v_star[(j, i)]) * dx);
flow_field.sp[(j, i)] = -divergence_flux;
}
}
for _iter in 0..100 {
// Inner iterations for pressure correction
let mut residual: f64 = 0.0;
// With the correction `u = u* - (dt/rho) (p'_P - p'_W)/dx`, continuity
// of the corrected field gives neighbour coefficients
// `rho (dt/rho) A / delta = dt A / delta`.
let ae_interior = dt * dy / dx;
let an_interior = dt * dx / dy;
for j in 1..(ny - 1) {
for i in 1..(nx - 1) {
// Compute mass imbalance (divergence of velocity)
let mass_imbalance =
((flow_field.u_star[(j, i + 1)] - flow_field.u_star[(j, i)]) / dx
+ (flow_field.v_star[(j + 1, i)] - flow_field.v_star[(j, i)]) / dy)
* rho
/ dt;
for _sweep in 0..400 {
let mut residual = 0.0;
for j in 0..ny {
for i in 0..nx {
if i == 1 && j == 1 {
flow_field.p_prime[(j, i)] = 0.0;
continue;
}
// Coefficients for pressure correction equation
let ae = 1.0 / (dx * dx);
let aw = 1.0 / (dx * dx);
let an = 1.0 / (dy * dy);
let as_ = 1.0 / (dy * dy);
let ae = if i + 1 == nx { 0.0 } else { ae_interior };
let aw = if i == 0 { 0.0 } else { ae_interior };
let an = if j + 1 == ny { 0.0 } else { an_interior };
let as_ = if j == 0 { 0.0 } else { an_interior };
let ap = ae + aw + an + as_;
// Neighboring pressure corrections
let p_east = if i < nx - 2 {
flow_field.p_prime[(j, i + 1)]
let east = if i + 1 < nx {
ae * flow_field.p_prime[(j, i + 1)]
} else {
0.0
};
let p_west = if i > 1 {
flow_field.p_prime[(j, i - 1)]
let west = if i > 0 {
aw * flow_field.p_prime[(j, i - 1)]
} else {
0.0
};
let p_north = if j < ny - 2 {
flow_field.p_prime[(j + 1, i)]
let north = if j + 1 < ny {
an * flow_field.p_prime[(j + 1, i)]
} else {
0.0
};
let p_south = if j > 1 {
flow_field.p_prime[(j - 1, i)]
let south = if j > 0 {
as_ * flow_field.p_prime[(j - 1, i)]
} else {
0.0
};
// Gauss-Seidel update
let p_prime_new =
(ae * p_east + aw * p_west + an * p_north + as_ * p_south + mass_imbalance)
/ ap;
let correction_residual = (p_prime_new - flow_field.p_prime[(j, i)]).abs();
residual = residual.max(correction_residual);
flow_field.p_prime[(j, i)] = p_prime_new;
let p_new = (flow_field.sp[(j, i)] + east + west + north + south) / ap;
let correction = p_new - flow_field.p_prime[(j, i)];
residual += correction * correction;
flow_field.p_prime[(j, i)] = p_new;
}
}
max_residual = residual;
// Check inner convergence
if residual < 1e-8 {
if residual.sqrt() < 1e-12 {
break;
}
}
// Update pressure: p^(n+1) = p^n + p'
// Correct exactly the faces the equation above treated as
// correctable: every interior face.
for j in 0..ny {
for i in 1..nx {
let dp_dx = (flow_field.p_prime[(j, i)] - flow_field.p_prime[(j, i - 1)]) / dx;
flow_field.u[(j, i)] = flow_field.u_star[(j, i)] - (dt / rho) * dp_dx;
}
}
for j in 1..ny {
for i in 0..nx {
let dp_dy = (flow_field.p_prime[(j, i)] - flow_field.p_prime[(j - 1, i)]) / dy;
flow_field.v[(j, i)] = flow_field.v_star[(j, i)] - (dt / rho) * dp_dy;
}
}
// Fold the correction into the pressure. No under-relaxation: PISO
// corrects rather than iterates within the step.
for j in 0..ny {
for i in 0..nx {
flow_field.p[(j, i)] += flow_field.p_prime[(j, i)];
}
}
Ok(max_residual)
}
/// Correct velocities based on pressure correction
/// u^(n+1) = u* - (dt/ρ)∇p'
fn correct_velocities(
&self,
flow_field: &mut FlowField,
dt: f64,
rho: f64,
dx: f64,
dy: f64,
) -> CfdResult<()> {
let (nx, ny, _, _) = flow_field.grid_info();
// Correct u-velocities
for j in 1..(ny - 1) {
for i in 1..nx {
let dp_dx = if i > 0 && i < nx {
(flow_field.p_prime[(j, i.min(nx - 1))]
- flow_field.p_prime[(j, (i - 1).max(0))])
/ dx
} else {
0.0
};
flow_field.u[(j, i)] = flow_field.u_star[(j, i)] - (dt / rho) * dp_dx;
// What is left after the correction.
let mut mass_imbalance = 0.0;
for j in 0..ny {
for i in 0..nx {
let divergence_flux = rho
* ((flow_field.u[(j, i + 1)] - flow_field.u[(j, i)]) * dy
+ (flow_field.v[(j + 1, i)] - flow_field.v[(j, i)]) * dx);
mass_imbalance += divergence_flux.abs();
}
}
// Correct v-velocities
for j in 1..ny {
for i in 1..(nx - 1) {
let dp_dy = if j > 0 && j < ny {
(flow_field.p_prime[(j.min(ny - 1), i)]
- flow_field.p_prime[((j - 1).max(0), i)])
/ dy
} else {
0.0
};
flow_field.v[(j, i)] = flow_field.v_star[(j, i)] - (dt / rho) * dp_dy;
}
}
Ok(())
let reference = rho * self.config.reference_velocity * self.config.reference_length;
Ok(if reference > 0.0 {
mass_imbalance / reference
} else {
mass_imbalance
})
}
}
@@ -505,54 +448,35 @@ impl IncompressibleSolver for PisoSolver {
) -> CfdResult<Self::Result> {
let start_time = std::time::Instant::now();
let mut residual_history = Vec::new();
let (_nx, _ny, dx, dy) = flow_field.grid_info();
// Physical properties from config
let rho = self.config.density;
let nu = self.config.viscosity / rho; // kinematic viscosity
// Store old values for time derivative
// The state at the start of the step is what the explicit predictor
// differentiates.
flow_field.apply_boundary_conditions(boundary_conditions)?;
flow_field.update_old_values();
// Apply boundary conditions
flow_field.apply_boundary_conditions(boundary_conditions)?;
// STEP 1: MOMENTUM PREDICTOR
// Solve momentum equations with pressure from previous time step
// ∂u/∂t + ∇·(u⊗u) = -∇p/ρ + ν∇²u
self.solve_momentum_predictor(flow_field, dt, rho, nu)?;
self.momentum_predictor(flow_field, dt)?;
let mut total_corrector_steps = 0;
// PRESSURE-VELOCITY CORRECTION LOOP
for _corrector in 0..self.parameters.corrector_steps {
// STEP 2: PRESSURE CORRECTION
// Solve pressure Poisson equation: ∇²p' = ρ∇·u*/dt
let pressure_residual = self.solve_pressure_correction(flow_field, dt, rho, dx, dy)?;
residual_history.push(pressure_residual);
// STEP 3: VELOCITY CORRECTION
// Update velocities: u = u* - (dt/ρ)∇p'
self.correct_velocities(flow_field, dt, rho, dx, dy)?;
// Apply boundary conditions after correction
flow_field.apply_boundary_conditions(boundary_conditions)?;
let mut final_residual = f64::INFINITY;
for _corrector in 0..self.parameters.corrector_steps.max(1) {
let mass_residual = self.project(flow_field, dt)?;
residual_history.push(mass_residual);
final_residual = mass_residual;
total_corrector_steps += 1;
// Check convergence
if pressure_residual < self.parameters.tolerance {
if mass_residual < self.parameters.tolerance {
break;
}
// Re-project from the corrected field: with an explicit predictor
// the second pass mops up the inner solver's truncation.
flow_field.copy_to_starred();
}
let solve_time = start_time.elapsed();
let final_residual = residual_history.last().copied().unwrap_or(0.0);
let converged = final_residual < self.parameters.tolerance;
Ok(PisoResult {
solver_result: SolverResult {
converged,
converged: final_residual < self.parameters.tolerance,
iterations: total_corrector_steps,
final_residual,
residual_history,