mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Removed alphaOuterCorrectors option because the mass-flux should be updated for all PIMPLE iterations
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1225
This commit is contained in:
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -82,14 +82,11 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
#include "alphaControls.H"
|
#include "alphaControls.H"
|
||||||
|
|
||||||
if (pimple.firstIter() || alphaOuterCorrectors)
|
twoPhaseProperties.correct();
|
||||||
{
|
|
||||||
twoPhaseProperties.correct();
|
|
||||||
|
|
||||||
#define LTSSOLVE
|
#define LTSSOLVE
|
||||||
#include "alphaEqnSubCycle.H"
|
#include "alphaEqnSubCycle.H"
|
||||||
#undef LTSSOLVE
|
#undef LTSSOLVE
|
||||||
}
|
|
||||||
|
|
||||||
turbulence->correct();
|
turbulence->correct();
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -86,14 +86,11 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
#include "alphaControls.H"
|
#include "alphaControls.H"
|
||||||
|
|
||||||
if (pimple.firstIter() || alphaOuterCorrectors)
|
twoPhaseProperties.correct();
|
||||||
{
|
|
||||||
twoPhaseProperties.correct();
|
|
||||||
|
|
||||||
#include "alphaEqnSubCycle.H"
|
#include "alphaEqnSubCycle.H"
|
||||||
interface.correct();
|
interface.correct();
|
||||||
#include "zonePhaseVolumes.H"
|
#include "zonePhaseVolumes.H"
|
||||||
}
|
|
||||||
|
|
||||||
#include "UEqn.H"
|
#include "UEqn.H"
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -132,13 +132,10 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
#include "alphaControls.H"
|
#include "alphaControls.H"
|
||||||
|
|
||||||
if (pimple.firstIter() || alphaOuterCorrectors)
|
twoPhaseProperties.correct();
|
||||||
{
|
|
||||||
twoPhaseProperties.correct();
|
|
||||||
|
|
||||||
#include "alphaEqnSubCycle.H"
|
#include "alphaEqnSubCycle.H"
|
||||||
interface.correct();
|
interface.correct();
|
||||||
}
|
|
||||||
|
|
||||||
#include "UEqn.H"
|
#include "UEqn.H"
|
||||||
|
|
||||||
|
|||||||
@ -85,13 +85,10 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
#include "alphaControls.H"
|
#include "alphaControls.H"
|
||||||
|
|
||||||
if (pimple.firstIter() || alphaOuterCorrectors)
|
twoPhaseProperties.correct();
|
||||||
{
|
|
||||||
twoPhaseProperties.correct();
|
|
||||||
|
|
||||||
#include "alphaEqnSubCycle.H"
|
#include "alphaEqnSubCycle.H"
|
||||||
interface.correct();
|
interface.correct();
|
||||||
}
|
|
||||||
|
|
||||||
#include "UEqn.H"
|
#include "UEqn.H"
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,3 @@
|
|||||||
#include "alphaControls.H"
|
|
||||||
|
|
||||||
if (nAlphaSubCycles > 1)
|
if (nAlphaSubCycles > 1)
|
||||||
{
|
{
|
||||||
dimensionedScalar totalDeltaT = runTime.deltaT();
|
dimensionedScalar totalDeltaT = runTime.deltaT();
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -79,15 +79,12 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
#include "alphaControls.H"
|
#include "alphaControls.H"
|
||||||
|
|
||||||
if (pimple.firstIter() || alphaOuterCorrectors)
|
threePhaseProperties.correct();
|
||||||
{
|
|
||||||
threePhaseProperties.correct();
|
|
||||||
|
|
||||||
#include "alphaEqnsSubCycle.H"
|
#include "alphaEqnsSubCycle.H"
|
||||||
interface.correct();
|
interface.correct();
|
||||||
|
|
||||||
#define twoPhaseProperties threePhaseProperties
|
#define twoPhaseProperties threePhaseProperties
|
||||||
}
|
|
||||||
|
|
||||||
#include "UEqn.H"
|
#include "UEqn.H"
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -88,13 +88,10 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
#include "alphaControls.H"
|
#include "alphaControls.H"
|
||||||
|
|
||||||
if (pimple.firstIter() || alphaOuterCorrectors)
|
twoPhaseProperties.correct();
|
||||||
{
|
|
||||||
twoPhaseProperties.correct();
|
|
||||||
|
|
||||||
#include "alphaEqnSubCycle.H"
|
#include "alphaEqnSubCycle.H"
|
||||||
interface.correct();
|
interface.correct();
|
||||||
}
|
|
||||||
|
|
||||||
#include "UEqn.H"
|
#include "UEqn.H"
|
||||||
|
|
||||||
|
|||||||
@ -154,13 +154,10 @@ int main(int argc, char *argv[])
|
|||||||
dimensionedScalar("0", dimMass/dimTime, 0)
|
dimensionedScalar("0", dimMass/dimTime, 0)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (pimple.firstIter() || alphaOuterCorrectors)
|
twoPhaseProperties->correct();
|
||||||
{
|
|
||||||
twoPhaseProperties->correct();
|
|
||||||
|
|
||||||
#include "alphaEqnSubCycle.H"
|
#include "alphaEqnSubCycle.H"
|
||||||
interface.correct();
|
interface.correct();
|
||||||
}
|
|
||||||
|
|
||||||
#include "UEqn.H"
|
#include "UEqn.H"
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -100,13 +100,10 @@ int main(int argc, char *argv[])
|
|||||||
dimensionedScalar("0", dimMass/dimTime, 0)
|
dimensionedScalar("0", dimMass/dimTime, 0)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (pimple.firstIter() || alphaOuterCorrectors)
|
twoPhaseProperties->correct();
|
||||||
{
|
|
||||||
twoPhaseProperties->correct();
|
|
||||||
|
|
||||||
#include "alphaEqnSubCycle.H"
|
#include "alphaEqnSubCycle.H"
|
||||||
interface.correct();
|
interface.correct();
|
||||||
}
|
|
||||||
|
|
||||||
#include "UEqn.H"
|
#include "UEqn.H"
|
||||||
|
|
||||||
|
|||||||
@ -6,11 +6,6 @@ label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
|
|||||||
|
|
||||||
bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
|
bool MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
|
||||||
|
|
||||||
bool alphaOuterCorrectors
|
|
||||||
(
|
|
||||||
alphaControls.lookupOrDefault<Switch>("alphaOuterCorrectors", false)
|
|
||||||
);
|
|
||||||
|
|
||||||
// Apply the compression correction from the previous iteration
|
// Apply the compression correction from the previous iteration
|
||||||
// Improves efficiency for steady-simulations but can only be applied
|
// Improves efficiency for steady-simulations but can only be applied
|
||||||
// once the alpha field is reasonably steady, i.e. fully developed
|
// once the alpha field is reasonably steady, i.e. fully developed
|
||||||
|
|||||||
@ -24,8 +24,6 @@ solvers
|
|||||||
cAlpha 1;
|
cAlpha 1;
|
||||||
icAlpha 0;
|
icAlpha 0;
|
||||||
|
|
||||||
alphaOuterCorrectors yes;
|
|
||||||
|
|
||||||
MULESCorr yes;
|
MULESCorr yes;
|
||||||
nLimiterIter 10;
|
nLimiterIter 10;
|
||||||
alphaApplyPrevCorr yes;
|
alphaApplyPrevCorr yes;
|
||||||
|
|||||||
@ -23,8 +23,6 @@ solvers
|
|||||||
nAlphaSubCycles 1;
|
nAlphaSubCycles 1;
|
||||||
cAlpha 1;
|
cAlpha 1;
|
||||||
|
|
||||||
alphaOuterCorrectors yes;
|
|
||||||
|
|
||||||
MULESCorr yes;
|
MULESCorr yes;
|
||||||
nLimiterIter 5;
|
nLimiterIter 5;
|
||||||
alphaApplyPrevCorr true;
|
alphaApplyPrevCorr true;
|
||||||
|
|||||||
@ -21,7 +21,6 @@ solvers
|
|||||||
{
|
{
|
||||||
nAlphaCorr 2;
|
nAlphaCorr 2;
|
||||||
nAlphaSubCycles 1;
|
nAlphaSubCycles 1;
|
||||||
alphaOuterCorrectors yes;
|
|
||||||
cAlpha 1;
|
cAlpha 1;
|
||||||
|
|
||||||
MULESCorr yes;
|
MULESCorr yes;
|
||||||
|
|||||||
@ -21,7 +21,6 @@ solvers
|
|||||||
{
|
{
|
||||||
nAlphaCorr 2;
|
nAlphaCorr 2;
|
||||||
nAlphaSubCycles 1;
|
nAlphaSubCycles 1;
|
||||||
alphaOuterCorrectors yes;
|
|
||||||
cAlpha 1;
|
cAlpha 1;
|
||||||
|
|
||||||
MULESCorr yes;
|
MULESCorr yes;
|
||||||
|
|||||||
@ -21,7 +21,6 @@ solvers
|
|||||||
{
|
{
|
||||||
nAlphaCorr 2;
|
nAlphaCorr 2;
|
||||||
nAlphaSubCycles 1;
|
nAlphaSubCycles 1;
|
||||||
alphaOuterCorrectors yes;
|
|
||||||
cAlpha 1;
|
cAlpha 1;
|
||||||
|
|
||||||
MULESCorr yes;
|
MULESCorr yes;
|
||||||
|
|||||||
Reference in New Issue
Block a user