Top level changes to icoFoam

Note: intermediate step indicating desired top level code design. Does not
compile.
This commit is contained in:
Vuko Vukcevic 2016-12-23 07:53:45 +01:00
parent 8bc571ee46
commit 9259021903

View file

@ -26,7 +26,8 @@ Application
Description Description
Transient solver for incompressible, laminar flow of Newtonian fluids. Transient solver for incompressible, laminar flow of Newtonian fluids.
Consistent formulation without time-step and relaxation dependence by Jasak Consistent formulation without time-step and relaxation dependence by
Jasak and Tukovic.
Author Author
Hrvoje Jasak, Wikki Ltd. All rights reserved Hrvoje Jasak, Wikki Ltd. All rights reserved
@ -66,24 +67,23 @@ int main(int argc, char *argv[])
- fvm::laplacian(nu, U) - fvm::laplacian(nu, U)
); );
// Time derivative matrix
fvVectorMatrix ddtUEqn(fvm::ddt(U));
if (piso.momentumPredictor()) if (piso.momentumPredictor())
{ {
solve(ddtUEqn + HUEqn == -fvc::grad(p)); solve(fvm::ddt(U) + HUEqn == -fvc::grad(p));
} }
// Prepare clean Ap without time derivative contribution // Prepare clean 1/a_p without time derivative contribution
// HJ, 26/Oct/2015 volScalarField rAU = 1.0/HUEqn.A();
volScalarField aU = HUEqn.A();
// --- PISO loop // --- PISO loop
while (piso.correct()) while (piso.correct())
{ {
U = HUEqn.H()/aU; // Calculate U from convection-diffusion matrix
phi = (fvc::interpolate(U) & mesh.Sf()); U = rAU*HUEqn.H();
// Consistently calculate flux and face velocity
phi = piso.timeConsistentFlux(U, rAU);
adjustPhi(phi, U, p); adjustPhi(phi, U, p);
@ -91,7 +91,7 @@ int main(int argc, char *argv[])
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
fvm::laplacian(1/aU, p) == fvc::div(phi) fvm::laplacian(rAU, p) == fvc::div(phi)
); );
pEqn.setReference(pRefCell, pRefValue); pEqn.setReference(pRefCell, pRefValue);
@ -108,12 +108,8 @@ int main(int argc, char *argv[])
# include "continuityErrs.H" # include "continuityErrs.H"
// Note: cannot call H(U) here because the velocity is not complete // Consistently reconstruct velocity after pressure equation
// HJ, 22/Jan/2016 U = piso.timeConsistentVelocity(U, rAU, p);
U = 1.0/(aU + ddtUEqn.A())*
(
U*aU - fvc::grad(p) + ddtUEqn.H()
);
U.correctBoundaryConditions(); U.correctBoundaryConditions();
} }