Commit 09f5d38f by henry

### Minor consistency changes.

parent 9a7ca2b9
 // Solve the Momentum equation // Solve the Momentum equation tmp UEqn ( fvm::ddt(rho, U) + fvm::div(phi, U) + turbulence->divDevRhoReff(U) ); tmp UEqn ( fvm::ddt(rho, U) + fvm::div(phi, U) + turbulence->divDevRhoReff(U) ); //if (oCorr != nOuterCorr-1) if (oCorr == nOuterCorr-1) { UEqn().relax(1); } else { UEqn().relax(); } volScalarField rUA = 1.0/UEqn().A(); if (momentumPredictor) { if (oCorr == nOuterCorr-1) { UEqn().relax(); solve(UEqn() == -fvc::grad(p), mesh.solver("UFinal")); } if (momentumPredictor) else { if (oCorr == nOuterCorr-1) { solve(UEqn() == -fvc::grad(p), mesh.solver("UFinal")); } else { solve(UEqn() == -fvc::grad(p)); } solve(UEqn() == -fvc::grad(p)); } } else { U = rUA*(UEqn().H() - fvc::grad(p)); U.correctBoundaryConditions(); }
 ... ... @@ -29,7 +29,12 @@ if (transonic) - fvm::laplacian(rho*rUA, p) ); if (oCorr == nOuterCorr-1 && corr == nCorr-1 && nonOrth == nNonOrthCorr) if ( oCorr == nOuterCorr-1 && corr == nCorr-1 && nonOrth == nNonOrthCorr ) { pEqn.solve(mesh.solver("pFinal")); } ... ... @@ -46,7 +51,7 @@ if (transonic) } else { phi = phi = fvc::interpolate(rho)* ( (fvc::interpolate(U) & mesh.Sf()) ... ... @@ -57,6 +62,7 @@ else for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { // Pressure corrector fvScalarMatrix pEqn ( fvm::ddt(psi, p) ... ... @@ -64,7 +70,12 @@ else - fvm::laplacian(rho*rUA, p) ); if (oCorr == nOuterCorr-1 && corr == nCorr-1 && nonOrth == nNonOrthCorr) if ( oCorr == nOuterCorr-1 && corr == nCorr-1 && nonOrth == nNonOrthCorr ) { pEqn.solve(mesh.solver("pFinal")); } ... ...
 ... ... @@ -68,9 +68,8 @@ int main(int argc, char *argv[]) rho.storePrevIter(); } // --- PIMPLE loop int oCorr=0; do // --- Pressure-velocity PIMPLE corrector loop for (int oCorr=0; oCorrcorrect(); } while (++oCorr < nOuterCorr); } runTime.write(); ... ...
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!