Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
5b4cd73e
Commit
5b4cd73e
authored
Mar 26, 2011
by
Henry
Browse files
PIMPLE: Rationalised loop structure
Automated the caching of "finalIteration".
parent
04bb783b
Changes
34
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/fireFoam/fireFoam.C
View file @
5b4cd73e
...
...
@@ -33,8 +33,8 @@ Description
#include
"hsCombustionThermo.H"
#include
"turbulenceModel.H"
#include
"combustionModel.H"
#include
"radiationModel.H"
#include
"pimpleLoop.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
while
(
runTime
.
run
())
{
#include
"readPI
SO
Controls.H"
#include
"readPI
MPLE
Controls.H"
#include
"readTimeControls.H"
#include
"compressibleCourantNo.H"
#include
"setDeltaT.H"
...
...
@@ -68,14 +68,13 @@ int main(int argc, char *argv[])
#include
"rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for
(
int
oCorr
=
0
;
oCorr
<
nOuterCorr
;
oCorr
++
)
for
(
pimpleLoop
pimpleCorr
(
mesh
,
nOuterCorr
);
pimpleCorr
.
loop
();
pimpleCorr
++
)
{
bool
finalIter
=
oCorr
==
nOuterCorr
-
1
;
if
(
finalIter
)
{
mesh
.
data
::
add
(
"finalIteration"
,
true
);
}
#include
"UEqn.H"
#include
"ftEqn.H"
...
...
@@ -86,11 +85,6 @@ int main(int argc, char *argv[])
{
#include
"pEqn.H"
}
if
(
finalIter
)
{
mesh
.
data
::
remove
(
"finalIteration"
);
}
}
turbulence
->
correct
();
...
...
applications/solvers/combustion/fireFoam/pEqn.H
View file @
5b4cd73e
...
...
@@ -33,7 +33,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
p_rgh
.
select
(
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
applications/solvers/combustion/rhoReactingFoam/pEqn.H
View file @
5b4cd73e
...
...
@@ -45,9 +45,9 @@
p
.
select
(
(
finalIter
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
)
)
...
...
@@ -89,9 +89,9 @@
p
.
select
(
(
finalIter
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
)
)
...
...
applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
View file @
5b4cd73e
...
...
@@ -36,6 +36,7 @@ Description
#include
"rhoChemistryModel.H"
#include
"chemistrySolver.H"
#include
"multivariateScheme.H"
#include
"pimpleLoop.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -69,14 +70,14 @@ int main(int argc, char *argv[])
#include
"chemistry.H"
#include
"rhoEqn.H"
for
(
label
oCorr
=
1
;
oCorr
<=
nOuterCorr
;
oCorr
++
)
// --- Pressure-velocity PIMPLE corrector loop
for
(
pimpleLoop
pimpleCorr
(
mesh
,
nOuterCorr
);
pimpleCorr
.
loop
();
pimpleCorr
++
)
{
bool
finalIter
=
oCorr
==
nOuterCorr
-
1
;
if
(
finalIter
)
{
mesh
.
data
::
add
(
"finalIteration"
,
true
);
}
#include
"UEqn.H"
#include
"YEqn.H"
#include
"hsEqn.H"
...
...
@@ -86,11 +87,6 @@ int main(int argc, char *argv[])
{
#include
"pEqn.H"
}
if
(
finalIter
)
{
mesh
.
data
::
remove
(
"finalIteration"
);
}
}
turbulence
->
correct
();
...
...
applications/solvers/compressible/rhoPimpleFoam/pEqn.H
View file @
5b4cd73e
...
...
@@ -37,7 +37,7 @@ if (transonic)
(
p
.
select
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
@@ -75,7 +75,7 @@ else
(
p
.
select
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C
View file @
5b4cd73e
...
...
@@ -38,6 +38,7 @@ Description
#include
"basicPsiThermo.H"
#include
"turbulenceModel.H"
#include
"fvcSmooth.H"
#include
"pimpleLoop.H"
#include
"bound.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -70,20 +71,21 @@ int main(int argc, char *argv[])
#include
"rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for
(
int
oCorr
=
0
;
oCorr
<
nOuterCorr
;
oCorr
++
)
for
(
pimpleLoop
pimpleCorr
(
mesh
,
nOuterCorr
);
pimpleCorr
.
loop
();
pimpleCorr
++
)
{
bool
finalIter
=
oCorr
==
nOuterCorr
-
1
;
if
(
finalIter
)
{
mesh
.
data
::
add
(
"finalIteration"
,
true
);
}
if
(
nOuterCorr
!=
1
)
{
p
.
storePrevIter
();
rho
.
storePrevIter
();
}
turbulence
->
correct
();
#include
"UEqn.H"
#include
"hEqn.H"
...
...
@@ -92,13 +94,6 @@ int main(int argc, char *argv[])
{
#include
"pEqn.H"
}
turbulence
->
correct
();
if
(
finalIter
)
{
mesh
.
data
::
remove
(
"finalIteration"
);
}
}
runTime
.
write
();
...
...
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
View file @
5b4cd73e
...
...
@@ -37,6 +37,7 @@ Description
#include
"basicPsiThermo.H"
#include
"turbulenceModel.H"
#include
"bound.H"
#include
"pimpleLoop.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -64,14 +65,13 @@ int main(int argc, char *argv[])
#include
"rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for
(
int
oCorr
=
0
;
oCorr
<
nOuterCorr
;
oCorr
++
)
for
(
pimpleLoop
pimpleCorr
(
mesh
,
nOuterCorr
);
pimpleCorr
.
loop
();
pimpleCorr
++
)
{
bool
finalIter
=
oCorr
==
nOuterCorr
-
1
;
if
(
finalIter
)
{
mesh
.
data
::
add
(
"finalIteration"
,
true
);
}
if
(
nOuterCorr
!=
1
)
{
p
.
storePrevIter
();
...
...
@@ -88,11 +88,6 @@ int main(int argc, char *argv[])
}
turbulence
->
correct
();
if
(
finalIter
)
{
mesh
.
data
::
remove
(
"finalIteration"
);
}
}
runTime
.
write
();
...
...
applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
View file @
5b4cd73e
...
...
@@ -40,7 +40,7 @@ if (transonic)
p
.
select
(
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
@@ -81,7 +81,7 @@ else
p
.
select
(
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
View file @
5b4cd73e
...
...
@@ -39,6 +39,7 @@ Description
#include
"bound.H"
#include
"MRFZones.H"
#include
"porousZones.H"
#include
"pimpleLoop.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -69,14 +70,13 @@ int main(int argc, char *argv[])
#include
"rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for
(
int
oCorr
=
0
;
oCorr
<
nOuterCorr
;
oCorr
++
)
for
(
pimpleLoop
pimpleCorr
(
mesh
,
nOuterCorr
);
pimpleCorr
.
loop
();
pimpleCorr
++
)
{
bool
finalIter
=
oCorr
==
nOuterCorr
-
1
;
if
(
finalIter
)
{
mesh
.
data
::
add
(
"finalIteration"
,
true
);
}
if
(
nOuterCorr
!=
1
)
{
p
.
storePrevIter
();
...
...
@@ -93,11 +93,6 @@ int main(int argc, char *argv[])
}
turbulence
->
correct
();
if
(
finalIter
)
{
mesh
.
data
::
remove
(
"finalIteration"
);
}
}
runTime
.
write
();
...
...
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H
View file @
5b4cd73e
...
...
@@ -12,7 +12,7 @@
);
TEqn
.
relax
();
TEqn
.
solve
(
mesh
.
solver
(
T
.
select
(
finalIter
))
);
TEqn
.
solve
();
rhok
=
1
.
0
-
beta
*
(
T
-
TRef
);
}
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/UEqn.H
View file @
5b4cd73e
...
...
@@ -21,7 +21,6 @@
-
ghf
*
fvc
::
snGrad
(
rhok
)
-
fvc
::
snGrad
(
p_rgh
)
)
*
mesh
.
magSf
()
),
mesh
.
solver
(
U
.
select
(
finalIter
))
)
);
}
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
View file @
5b4cd73e
...
...
@@ -48,6 +48,7 @@ Description
#include
"fvCFD.H"
#include
"singlePhaseTransportModel.H"
#include
"RASModel.H"
#include
"pimpleLoop.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -77,14 +78,13 @@ int main(int argc, char *argv[])
#include
"setDeltaT.H"
// --- Pressure-velocity PIMPLE corrector loop
for
(
int
oCorr
=
0
;
oCorr
<
nOuterCorr
;
oCorr
++
)
for
(
pimpleLoop
pimpleCorr
(
mesh
,
nOuterCorr
);
pimpleCorr
.
loop
();
pimpleCorr
++
)
{
bool
finalIter
=
oCorr
==
nOuterCorr
-
1
;
if
(
finalIter
)
{
mesh
.
data
::
add
(
"finalIteration"
,
true
);
}
if
(
nOuterCorr
!=
1
)
{
p_rgh
.
storePrevIter
();
...
...
@@ -100,11 +100,6 @@ int main(int argc, char *argv[])
}
turbulence
->
correct
();
if
(
finalIter
)
{
mesh
.
data
::
remove
(
"finalIteration"
);
}
}
runTime
.
write
();
...
...
applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
View file @
5b4cd73e
...
...
@@ -26,7 +26,7 @@
p_rgh
.
select
(
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
View file @
5b4cd73e
...
...
@@ -21,7 +21,6 @@
-
ghf
*
fvc
::
snGrad
(
rho
)
-
fvc
::
snGrad
(
p_rgh
)
)
*
mesh
.
magSf
()
),
mesh
.
solver
(
U
.
select
(
finalIter
))
)
);
}
applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
View file @
5b4cd73e
...
...
@@ -37,6 +37,7 @@ Description
#include
"basicRhoThermo.H"
#include
"turbulenceModel.H"
#include
"fixedGradientFvPatchFields.H"
#include
"pimpleLoop.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -70,14 +71,13 @@ int main(int argc, char *argv[])
#include
"rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for
(
int
oCorr
=
0
;
oCorr
<
nOuterCorr
;
oCorr
++
)
for
(
pimpleLoop
pimpleCorr
(
mesh
,
nOuterCorr
);
pimpleCorr
.
loop
();
pimpleCorr
++
)
{
bool
finalIter
=
oCorr
==
nOuterCorr
-
1
;
if
(
finalIter
)
{
mesh
.
data
::
add
(
"finalIteration"
,
true
);
}
if
(
nOuterCorr
!=
1
)
{
p_rgh
.
storePrevIter
();
...
...
@@ -95,11 +95,6 @@ int main(int argc, char *argv[])
turbulence
->
correct
();
rho
=
thermo
.
rho
();
if
(
finalIter
)
{
mesh
.
data
::
remove
(
"finalIteration"
);
}
}
runTime
.
write
();
...
...
applications/solvers/heatTransfer/buoyantPimpleFoam/hEqn.H
View file @
5b4cd73e
...
...
@@ -9,7 +9,7 @@
);
hEqn
.
relax
();
hEqn
.
solve
(
mesh
.
solver
(
h
.
select
(
finalIter
))
);
hEqn
.
solve
();
thermo
.
correct
();
}
applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
View file @
5b4cd73e
...
...
@@ -40,7 +40,7 @@
p_rgh
.
select
(
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
applications/solvers/incompressible/pimpleFoam/pEqn.H
View file @
5b4cd73e
...
...
@@ -27,7 +27,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
(
p
.
select
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
View file @
5b4cd73e
...
...
@@ -30,7 +30,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
p
.
select
(
(
finalIter
pimpleCorr
.
finalIter
()
&&
corr
==
nCorr
-
1
&&
nonOrth
==
nNonOrthCorr
)
...
...
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
View file @
5b4cd73e
...
...
@@ -36,6 +36,7 @@ Description
#include
"singlePhaseTransportModel.H"
#include
"turbulenceModel.H"
#include
"dynamicFvMesh.H"
#include
"pimpleLoop.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -83,15 +84,14 @@ int main(int argc, char *argv[])
#include
"meshCourantNo.H"
}
// --- PIMPLE loop
for
(
int
oCorr
=
0
;
oCorr
<
nOuterCorr
;
oCorr
++
)
// --- Pressure-velocity PIMPLE corrector loop
for
(
pimpleLoop
pimpleCorr
(
mesh
,
nOuterCorr
);
pimpleCorr
.
loop
();
pimpleCorr
++
)
{
bool
finalIter
=
oCorr
==
nOuterCorr
-
1
;
if
(
finalIter
)
{
mesh
.
data
::
add
(
"finalIteration"
,
true
);
}
if
(
nOuterCorr
!=
1
)
{
p
.
storePrevIter
();
...
...
@@ -106,11 +106,6 @@ int main(int argc, char *argv[])
}
turbulence
->
correct
();
if
(
finalIter
)
{
mesh
.
data
::
remove
(
"finalIteration"
);
}
}
runTime
.
write
();
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment