zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

solutionControl: Made simple and pimple name convention consistent

Browse Source
This commit is contained in:
Will Bainbridge
2018-02-08 08:50:54 +00:00
parent 5f384182dc
commit 2b76b83343
25 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/compressible/rhoPimpleFoam/pEqn.H
View File

@ -1,4 +1,4 @@
if (!pimple.SIMPLErho())
if (!pimple.simpleRho())
{
rho = thermo.rho();
}
@ -104,7 +104,7 @@ if (pressureControl.limit(p))
p.correctBoundaryConditions();
rho = thermo.rho();
}
else if (pimple.SIMPLErho())
else if (pimple.simpleRho())
{
rho = thermo.rho();
}

4
applications/solvers/compressible/rhoPimpleFoam/pcEqn.H
View File

@ -1,4 +1,4 @@
if (!pimple.SIMPLErho())
if (!pimple.simpleRho())
{
rho = thermo.rho();
}
@ -115,7 +115,7 @@ if (pressureControl.limit(p))
p.correctBoundaryConditions();
rho = thermo.rho();
}
else if (pimple.SIMPLErho())
else if (pimple.simpleRho())
{
rho = thermo.rho();
}

4
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -141,7 +141,7 @@ int main(int argc, char *argv[])
}
}
if (pimple.nCorrPIMPLE() <= 1)
if (pimple.nCorrPimple() <= 1)
{
#include "rhoEqn.H"
}

4
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
View File

@ -1,4 +1,4 @@
if (!mesh.steady() && !pimple.SIMPLErho())
if (!mesh.steady() && !pimple.simpleRho())
{
rho = thermo.rho();
}
@ -132,7 +132,7 @@ if (adjustMass || pLimited)
}
// Density updates
if (adjustMass || pLimited || mesh.steady() || pimple.SIMPLErho())
if (adjustMass || pLimited || mesh.steady() || pimple.simpleRho())
{
rho = thermo.rho();
}

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
View File

@ -4,7 +4,7 @@ if (!pimple.solveFlow())
}
else
{
if (!mesh.steady() && pimples.nCorrPIMPLE() <= 1)
if (!mesh.steady() && pimples.nCorrPimple() <= 1)
{
#include "rhoEqn.H"
}

4
applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
View File

@ -1,4 +1,4 @@
if (!pimple.SIMPLErho())
if (!pimple.simpleRho())
{
rho = thermo.rho();
}
@ -76,7 +76,7 @@ if (pressureControl.limit(p))
rho = thermo.rho();
p_rgh = p - rho*gh;
}
else if (pimple.SIMPLErho())
else if (pimple.simpleRho())
{
rho = thermo.rho();
}

4
applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -94,7 +94,7 @@ int main(int argc, char *argv[])
if (solvePrimaryRegion)
{
if (pimple.nCorrPIMPLE() <= 1)
if (pimple.nCorrPimple() <= 1)
{
#include "rhoEqn.H"
}

2
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
View File

@ -1,5 +1,5 @@
{
if (pimple.nCorrPIMPLE() == 1)
if (pimple.nCorrPimple() == 1)
{
p =
(

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

@ -1,5 +1,5 @@
{
if (pimple.nCorrPIMPLE() == 1)
if (pimple.nCorrPimple() == 1)
{
p =
(