zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Updated more solvers to use the new algorithm container classes

Browse Source
This commit is contained in:
andy
2011-04-15 16:34:29 +01:00
parent 819a7f9082
commit 0301a62527
29 changed files with 136 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H
View File

@ -1,5 +1,5 @@
# include "readPISOControls.H"
#include "readPISOControls.H"
int nAlphaCorr(readInt(piso.lookup("nAlphaCorr")));
int nAlphaCorr(readInt(pisoDict.lookup("nAlphaCorr")));
Switch correctAlpha(piso.lookup("correctAlpha"));
Switch correctAlpha(pisoDict.lookup("correctAlpha"));

4
applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
for (int outerCorr=0; outerCorr<pimple.nOuterCorr(); outerCorr++)
for (pimple.start(); pimple.loop(); pimple++)
{
#include "rhoEqn.H"
#include "gammaPsi.H"

12
applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
View File

@ -1,13 +1,7 @@
{
label nAlphaCorr
(
readLabel(piso.lookup("nAlphaCorr"))
);
label nAlphaCorr(readLabel(pimple.dict().lookup("nAlphaCorr")));
label nAlphaSubCycles
(
readLabel(piso.lookup("nAlphaSubCycles"))
);
label nAlphaSubCycles(readLabel(pimple.dict().lookup("nAlphaSubCycles")));
surfaceScalarField phic(mag(phi/mesh.magSf()));
phic = min(interface.cAlpha()*phic, max(phic));
@ -36,7 +30,7 @@
#include "alphaEqns.H"
}
if (oCorr == 0)
if (pimple.corr() == 0)
{
interface.correct();
}

12
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/alphaEqnsSubCycle.H
View File

@ -1,13 +1,7 @@
{
label nAlphaCorr
(
readLabel(piso.lookup("nAlphaCorr"))
);
label nAlphaCorr(readLabel(pimple.dict().lookup("nAlphaCorr")));
label nAlphaSubCycles
(
readLabel(piso.lookup("nAlphaSubCycles"))
);
label nAlphaSubCycles(readLabel(pimple.dict().lookup("nAlphaSubCycles")));
surfaceScalarField phic(mag(phi/mesh.magSf()));
phic = min(interface.cAlpha()*phic, max(phic));
@ -38,7 +32,7 @@
#include "alphaEqns.H"
}
if (oCorr == 0)
if (pimple.corr() == 0)
{
interface.correct();
}

11
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,6 +54,9 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "readGravitationalAcceleration.H"
pimpleControl pimple(mesh);
#include "readControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
@ -61,8 +64,6 @@ int main(int argc, char *argv[])
#include "CourantNo.H"
#include "setInitialDeltaT.H"
pimpleControl pimple(mesh);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
@ -116,7 +117,7 @@ int main(int argc, char *argv[])
turbulence->correct();
// --- Outer-corrector loop
for (int oCorr=0; oCorr<pimple.nOuterCorr(); oCorr++)
for (pimple.start(); pimple.loop(); pimple++)
{
#include "alphaEqnsSubCycle.H"
@ -125,7 +126,7 @@ int main(int argc, char *argv[])
#include "UEqn.H"
// --- PISO loop
for (int corr=0; corr<oimple.nCorr(); corr++)
for (int corr=0; corr<pimple.nCorr(); corr++)
{
#include "pEqn.H"
}

4
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H
View File

@ -42,7 +42,7 @@
adjustPhi(phi, U, pcorr);
for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
for(int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
{
fvScalarMatrix pcorrEqn
(
@ -51,7 +51,7 @@
pcorrEqn.solve();
if (nonOrth == nNonOrthCorr)
if (nonOrth == pimple.nNonOrthCorr())
{
phi -= pcorrEqn.flux();
}

2
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
View File

@ -4,7 +4,7 @@
label nAlphaSubCycles(readLabel(pimple.dict().lookup("nAlphaSubCycles")));
if (nAlphaSubCycles > 1 && nOuterCorr != 1)
if (nAlphaSubCycles > 1 && pimple.nOuterCorr() != 1)
{
FatalErrorIn(args.executable())
<< "Sub-cycling alpha is only allowed for PISO, "

9
applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -51,14 +51,15 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
pimpleControl pimple(mesh);
#include "readControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
pimpleControl pimple(mesh);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
@ -74,7 +75,7 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Outer-corrector loop
for (int oCorr=0; oCorr<pimple.nOuterCorr(); oCorr++)
for (pimple.start(); pimple.loop(); pimple++)
{
#include "alphaEqnsSubCycle.H"

2
applications/solvers/multiphase/compressibleInterFoam/pEqn.H
View File

@ -4,7 +4,7 @@
tmp<fvScalarMatrix> p_rghEqnComp;
if (transonic)
if (pimple.transonic())
{
p_rghEqnComp =
(

2
applications/solvers/multiphase/compressibleInterFoam/readControls.H
View File

@ -10,7 +10,7 @@
readLabel(pimple.dict().lookup("nAlphaSubCycles"))
);
if (nAlphaSubCycles > 1 && nOuterCorr != 1)
if (nAlphaSubCycles > 1 && pimple.nOuterCorr() != 1)
{
FatalErrorIn(args.executable())
<< "Sub-cycling alpha is only allowed for PISO, "

1
applications/solvers/multiphase/interFoam/interFoam.C
View File

@ -70,7 +70,6 @@ int main(int argc, char *argv[])
while (runTime.run())
{
#include "readPISOControls.H"
#include "readTimeControls.H"
#include "CourantNo.H"
#include "alphaCourantNo.H"

5
applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -174,7 +174,8 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
(
readScalar
(
mixture.U().mesh().solutionDict().subDict("PISO").lookup("cAlpha")
mixture.U().mesh().solutionDict().subDict("PIMPLE").
lookup("cAlpha")
)
),
sigma12_(mixture.lookup("sigma12")),

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
applications/solvers/multiphase/settlingFoam/createFields.H
View File

@ -366,7 +366,7 @@
(
p,
p_rgh,
mesh.solutionDict().subDict("PISO"),
mesh.solutionDict().subDict("PIMPLE"),
pRefCell,
pRefValue
);

2
applications/solvers/multiphase/settlingFoam/settlingFoam.C
View File

@ -65,7 +65,7 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
for (int oCorr=0; oCorr<pimple.nOuterCorr(); oCorr++)
for (pimple.start(); pimple.loop(); pimple++)
{
#include "calcVdj.H"

2
applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
View File

@ -234,4 +234,4 @@
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue);
setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);

5
applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H
View File

@ -1,5 +1,6 @@
#include "readTimeControls.H"
#include "readPISOControls.H"
int nAlphaCorr(readInt(pimple.dict().lookup("nAlphaCorr")));
int nAlphaCorr(readInt(pisoDict.lookup("nAlphaCorr")));
Switch correctAlpha(pimple.dict().lookup("correctAlpha"));
Switch correctAlpha(pisoDict.lookup("correctAlpha"));