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

Backported multiSolver and tutorials (vanilla OF 3.0.1)

Browse source
This commit is contained in:
Vanja Skuric 2016-05-28 12:33:12 +02:00
parent f3b7d067b7
commit b4f8bce87c
8 changed files with 15 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H
View file

@ -52,4 +52,5 @@
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
setRefCell(p, piso.dict(), pRefCell, pRefValue);
mesh.schemesDict().setFluxRequired(p.name());

2
applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C
View file

@ -35,6 +35,8 @@ Author
#include "fvCFD.H"
#include "multiSolver.H"
#include "pisoControl.H"
#include "simpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H
View file

@ -1,6 +1,9 @@
# include "createTime.H"
# include "createMesh.H"
pisoControl piso(mesh);
# include "createFields_icoFoam.H"
# include "initContinuityErrs.H"
@ -12,7 +15,6 @@
{
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readPISOControls.H"
# include "CourantNo.H"
fvVectorMatrix UEqn
@ -26,7 +28,7 @@
// --- PISO loop
for (int corr=0; corr<nCorr; corr++)
while (piso.correct())
{
volScalarField rUA = 1.0/UEqn.A();
@ -36,7 +38,7 @@
adjustPhi(phi, U, p);
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
while (piso.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@ -46,7 +48,7 @@
pEqn.setReference(pRefCell, pRefValue);
pEqn.solve();
if (nonOrth == nNonOrthCorr)
if (piso.finalNonOrthogonalIter())
{
phi -= pEqn.flux();
}

15
applications/solvers/multiSolver/multiSolverDemo/solverScalarTransportFoam.H
View file

@ -1,5 +1,8 @@
# include "createTime.H"
# include "createMesh.H"
simpleControl simple(mesh);
# include "createFields_scalarTransportFoam.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -8,19 +11,11 @@
# include "CourantNo.H"
for (runTime++; !runTime.end(); runTime++)
while (simple.loop())
{
Info<< "Time = " << runTime.timeName() << nl << endl;
dictionary simple = mesh.solutionDict().subDict("SIMPLE");
int nNonOrthCorr =
simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
bool momentumPredictor =
simple.lookupOrDefault<Switch>("momentumPredictor", true);
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
while (simple.correctNonOrthogonal())
{
solve
(

6
tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/fvSchemes
View file

@ -50,10 +50,4 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

11
tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/multiFvSchemes
View file

@ -97,12 +97,6 @@ multiSolver
{
default corrected;
}
fluxRequired
{
default no;
p;
}
}
scalarTransportFoam
@ -139,11 +133,6 @@ multiSolver
{
default corrected;
}
fluxRequired
{
default no;
}
}
}

6
tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/fvSchemes
View file

@ -50,10 +50,4 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

17
tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/multiFvSchemes
View file

@ -53,12 +53,6 @@ multiSolver
{
default corrected;
}
fluxRequired
{
default no;
p;
}
}
icoFoam2
@ -97,12 +91,6 @@ multiSolver
{
default corrected;
}
fluxRequired
{
default no;
p;
}
}
scalarTransportFoam
@ -139,11 +127,6 @@ multiSolver
{
default corrected;
}
fluxRequired
{
default no;
}
}
}