diff --git a/applications/solvers/cfdemSolverPimple/pEqn.H b/applications/solvers/cfdemSolverPimple/pEqn.H index 0e77ebdb..e20515d7 100644 --- a/applications/solvers/cfdemSolverPimple/pEqn.H +++ b/applications/solvers/cfdemSolverPimple/pEqn.H @@ -10,22 +10,22 @@ phi = voidfractionf*phiByVoidfraction; surfaceScalarField phiHbyA ( - "phiHbyA", - ( - (fvc::interpolate(HbyA) & mesh.Sf() ) - + phicForces //explicit contribution - + rAUfvoidfraction*fvc::ddtCorr(U, phiByVoidfraction) //correction - ) + "phiHbyA", + ( + (fvc::interpolate(HbyA) & mesh.Sf() ) + + phicForces //explicit contribution + + rAUfvoidfraction*fvc::ddtCorr(U, phiByVoidfraction) //correction + ) ); if (modelType=="A") rAUvoidfraction = volScalarField("(voidfraction2|A(U))",rAU*voidfraction*voidfraction); - + // Update the fixedFluxPressure BCs to ensure flux consistency if (modelType=="A") { - volScalarField rUsed = rAU*voidfraction; - constrainPressure(p, U, phiHbyA, rUsed,MRF); + volScalarField rUsed = rAU*voidfraction; + constrainPressure(p, U, phiHbyA, rUsed,MRF); } else constrainPressure(p, U, phiHbyA, rAU,MRF); @@ -37,23 +37,23 @@ while (pimple.correctNonOrthogonal()) fvm::laplacian(rAUvoidfraction, p) == fvc::div(voidfractionf*phiHbyA) + particleCloud.ddtVoidfraction() ); pEqn.setReference(pRefCell, pRefValue); - + pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); - + if (pimple.finalNonOrthogonalIter()) { - phiByVoidfraction = phiHbyA - pEqn.flux()/voidfractionf; - phi = voidfractionf*phiByVoidfraction; + phiByVoidfraction = phiHbyA - pEqn.flux()/voidfractionf; + phi = voidfractionf*phiByVoidfraction; - #include "continuityErrorPhiPU.H" + #include "continuityErrorPhiPU.H" - // Explicitly relax pressure for momentum corrector - p.relax(); + // Explicitly relax pressure for momentum corrector + p.relax(); - U = fvc::reconstruct(phiHbyA) - - rAU*fvc::reconstruct(pEqn.flux()/voidfractionf/rAUf); + U = fvc::reconstruct(phiHbyA) + - rAU*fvc::reconstruct(pEqn.flux()/voidfractionf/rAUf); - U.correctBoundaryConditions(); - fvOptions.correct(U); + U.correctBoundaryConditions(); + fvOptions.correct(U); } }