exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes for icoFoam, icoDyMFoam, icoDyMSimpleFoam, icoDyMEngineFoam, icoDyMIbFoam and icoIbFoam

Browse source
This commit is contained in:
Vanja Skuric 2016-04-13 16:21:35 +02:00
parent c2cef7d11f
commit a4f12aeb44
7 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
View file

@ -112,15 +112,10 @@ int main(int argc, char *argv[])
);
pEqn.setReference(pRefCell, pRefValue);
if (piso.finalInnerIter())
{
pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
}
else
{
pEqn.solve(mesh.solutionDict().solver(p.name()));
}
pEqn.solve
(
mesh.solutionDict().solver(p.select(piso.finalInnerIter()))
);
if (piso.finalNonOrthogonalIter())
{

13
applications/solvers/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C
View file

@ -84,7 +84,10 @@ int main(int argc, char *argv[])
- fvm::laplacian(nu, U)
);
solve(UEqn == -fvc::grad(p));
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
}
// --- PISO loop
while (pimple.correct())
@ -110,7 +113,13 @@ int main(int argc, char *argv[])
);
pEqn.setReference(pRefCell, pRefValue);
pEqn.solve();
pEqn.solve
(
mesh.solutionDict().solver
(
p.select(pimple.finalInnerIter())
)
);
if (pimple.finalNonOrthogonalIter())
{

13
applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C
View file

@ -73,7 +73,10 @@ int main(int argc, char *argv[])
- fvm::laplacian(nu, U)
);
solve(UEqn == -fvc::grad(p));
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
}
// --- PISO loop
while (pimple.correct())
@ -99,7 +102,13 @@ int main(int argc, char *argv[])
);
pEqn.setReference(pRefCell, pRefValue);
pEqn.solve();
pEqn.solve
(
mesh.solutionDict().solver
(
p.select(pimple.finalInnerIter())
)
);
if (pimple.finalNonOrthogonalIter())
{

2
applications/solvers/incompressible/icoDyMFoam/UEqn.H
View file

@ -5,7 +5,7 @@
- fvm::laplacian(nu, U)
);
if (momentumPredictor)
if (piso.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
}

13
applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
View file

@ -113,15 +113,10 @@ int main(int argc, char *argv[])
);
pEqn.setReference(pRefCell, pRefValue);
if (piso.finalInnerIter())
{
pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
}
else
{
pEqn.solve(mesh.solutionDict().solver(p.name()));
}
pEqn.solve
(
mesh.solutionDict().solver(p.select(piso.finalInnerIter()))
);
if (piso.finalNonOrthogonalIter())
{

13
applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
View file

@ -118,15 +118,10 @@ int main(int argc, char *argv[])
);
pEqn.setReference(pRefCell, pRefValue);
if(piso.finalInnerIter())
{
pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
}
else
{
pEqn.solve(mesh.solutionDict().solver(p.name()));
}
pEqn.solve
(
mesh.solutionDict().solver(p.select(piso.finalInnerIter()))
);
if (piso.finalNonOrthogonalIter())
{

21
applications/solvers/incompressible/icoFoam/icoFoam.C
View file

@ -56,6 +56,8 @@ int main(int argc, char *argv[])
# include "CourantNo.H"
// Momentum predictor
fvVectorMatrix UEqn
(
fvm::ddt(U)
@ -63,9 +65,13 @@ int main(int argc, char *argv[])
- fvm::laplacian(nu, U)
);
solve(UEqn == -fvc::grad(p));
if (piso.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
}
// --- PISO loop
while (piso.correct())
{
volScalarField rUA = 1.0/UEqn.A();
@ -85,15 +91,10 @@ int main(int argc, char *argv[])
);
pEqn.setReference(pRefCell, pRefValue);
if (piso.finalInnerIter())
{
pEqn.solve(mesh.solutionDict().solver("pFinal"));
}
else
{
pEqn.solve();
}
pEqn.solve
(
mesh.solutionDict().solver(p.select(piso.finalInnerIter()))
);
if (piso.finalNonOrthogonalIter())
{