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

STYLE: reduced nesting on return branching

Browse Source
This commit is contained in:
Mark Olesen
2019-02-13 08:06:36 +01:00
committed by Andrew Heather
parent 4bc3b2b9cb
commit 60234ab007
208 changed files with 1052 additions and 1759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -96,10 +96,8 @@ bool PDRkEpsilon::read()
C4_.readIfPresent(coeffDict_); C4_.readIfPresent(coeffDict_);
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2017 OpenFOAM Foundation | Copyright (C) 2017 OpenFOAM Foundation
@ -141,10 +141,8 @@ bool Foam::surfaceTensionModels::liquidProperties::writeData
{ {
return os.good(); return os.good();
} }
else
{ return false;
return false;
}
} }

8
applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation | Copyright (C) 2013-2017 OpenFOAM Foundation
@ -382,10 +382,8 @@ bool Foam::twoPhaseMixtureThermo::read()
{ {
return interfaceProperties::read(); return interfaceProperties::read();
} }
else
{ return false;
return false;
}
} }

12
applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2014-2015 OpenFOAM Foundation | Copyright (C) 2014-2015 OpenFOAM Foundation
@ -143,15 +143,9 @@ bool Foam::incompressibleTwoPhaseInteractingMixture::read()
return true; return true;
} }
else
{
return false;
}
}
else
{
return false;
} }
return false;
} }

8
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
View File

@ -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) 2017 OpenCFD Ltd. \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -541,10 +541,8 @@ bool Foam::radiation::laserDTRM::read()
{ {
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C
View File

@ -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) 2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -99,10 +99,8 @@ bool Foam::temperaturePhaseChangeTwoPhaseMixture::read()
{ {
return true; return true;
} }
else
{ return false;
return false;
}
} }

9
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C
View File

@ -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) 2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -112,7 +112,6 @@ Foam::thermoIncompressibleTwoPhaseMixture::thermoIncompressibleTwoPhaseMixture
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::thermoIncompressibleTwoPhaseMixture::read() bool Foam::thermoIncompressibleTwoPhaseMixture::read()
{ {
if (incompressibleTwoPhaseMixture::read()) if (incompressibleTwoPhaseMixture::read())
@ -131,10 +130,8 @@ bool Foam::thermoIncompressibleTwoPhaseMixture::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

12
applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -239,15 +239,9 @@ bool Foam::incompressibleThreePhaseMixture::read()
return true; return true;
} }
else
{
return false;
}
}
else
{
return false;
} }
return false;
} }

8
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -116,10 +116,8 @@ bool Foam::phaseChangeTwoPhaseMixtures::Kunz::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -111,10 +111,8 @@ bool Foam::phaseChangeTwoPhaseMixtures::Merkle::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -162,10 +162,8 @@ bool Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -90,10 +90,8 @@ bool Foam::phase::read(const dictionary& phaseDict)
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -211,10 +211,8 @@ bool Foam::RASModels::kineticTheoryModel::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -211,10 +211,8 @@ bool Foam::RASModels::kineticTheoryModel::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -93,10 +93,8 @@ bool limitRefinementLevel
return true; return true;
} }
else
{ return false;
return false;
}
} }

14
applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
View File

@ -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) 2018 OpenCFD Ltd. \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -417,14 +417,12 @@ bool limitRefinementLevel
} }
return true; return true;
} }
else
{
Info<< "Added no additional cells"
<< " to satisfy 1:" << limitDiff << " refinement level"
<< endl;
return false; Info<< "Added no additional cells"
} << " to satisfy 1:" << limitDiff << " refinement level"
<< endl;
return false;
} }

6
applications/utilities/mesh/advanced/splitCells/splitCells.C
View File

@ -359,10 +359,8 @@ bool splitCell
return true; return true;
} }
else
{ return false;
return false;
}
} }

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2012-2015 OpenFOAM Foundation | Copyright (C) 2012-2015 OpenFOAM Foundation
@ -149,14 +149,10 @@ bool Foam::conformalVoronoiMesh::regionIsInside
{ {
return meshableRegionA; return meshableRegionA;
} }
else
{
WarningInFunction
<< ""
<< endl;
return false; WarningInFunction << endl;
}
return false;
} }

8
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -89,10 +89,8 @@ inline bool Foam::CV2D::insertMirrorPoint
insertPoint(mirrorPoint, Vb::MIRROR_POINT); insertPoint(mirrorPoint, Vb::MIRROR_POINT);
return true; return true;
} }
else
{ return false;
return false;
}
} }

20
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertexI.H
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2015 OpenFOAM Foundation | Copyright (C) 2013-2015 OpenFOAM Foundation
@ -152,28 +152,14 @@ inline bool CGAL::indexedVertex<Gt, Vb>::pairPoint() const
template<class Gt, class Vb> template<class Gt, class Vb>
inline bool CGAL::indexedVertex<Gt, Vb>::ppMaster() const inline bool CGAL::indexedVertex<Gt, Vb>::ppMaster() const
{ {
if (type_ > index_) return (type_ > index_);
{
return true;
}
else
{
return false;
}
} }
template<class Gt, class Vb> template<class Gt, class Vb>
inline bool CGAL::indexedVertex<Gt, Vb>::ppSlave() const inline bool CGAL::indexedVertex<Gt, Vb>::ppSlave() const
{ {
if (type_ >= 0 && type_ < index_) return (type_ >= 0 && type_ < index_);
{
return true;
}
else
{
return false;
}
} }

8
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertBoundaryConformPointPairs.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2015 OpenFOAM Foundation | Copyright (C) 2013-2015 OpenFOAM Foundation
@ -147,10 +147,8 @@ bool Foam::CV2D::insertPointPairAtIntersection
insertPointPair(vit, interPoint, interTri, interHitSurface); insertPointPair(vit, interPoint, interTri, interHitSurface);
return true; return true;
} }
else
{ return false;
return false;
}
} }

27
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
View File

@ -253,15 +253,14 @@ bool Foam::checkWedges
return true; return true;
} }
else
if (report)
{ {
if (report) Info<< " All edges aligned with or perpendicular to "
{ << "non-empty directions." << endl;
Info<< " All edges aligned with or perpendicular to "
<< "non-empty directions." << endl;
}
return false;
} }
return false;
} }
@ -468,16 +467,14 @@ bool Foam::checkCoupledPoints
return true; return true;
} }
else
{
if (report)
{
Info<< " Coupled point location match (average "
<< avgMismatch << ") OK." << endl;
}
return false; if (report)
{
Info<< " Coupled point location match (average "
<< avgMismatch << ") OK." << endl;
} }
return false;
} }

6
applications/utilities/surface/surfaceClean/collapseBase.C
View File

@ -324,10 +324,8 @@ bool isSliver
return true; return true;
} }
else
{ return false;
return false;
}
} }

9
applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -666,12 +666,9 @@ bool splitBorderEdges
return true; return true;
} }
else
{
Info<< "No edges to be split" <<nl << endl;
return false; Info<< "No edges to be split" <<nl << endl;
} return false;
} }

8
src/ODE/ODESolvers/Euler/Euler.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -59,10 +59,8 @@ bool Foam::Euler::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/EulerSI/EulerSI.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -69,10 +69,8 @@ bool Foam::EulerSI::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/ODESolver/ODESolver.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -107,10 +107,8 @@ bool Foam::ODESolver::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/RKCK45/RKCK45.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -105,10 +105,8 @@ bool Foam::RKCK45::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/RKDP45/RKDP45.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -110,10 +110,8 @@ bool Foam::RKDP45::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/RKF45/RKF45.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -106,10 +106,8 @@ bool Foam::RKF45::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -85,10 +85,8 @@ bool Foam::Rosenbrock12::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -99,10 +99,8 @@ bool Foam::Rosenbrock23::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -145,10 +145,8 @@ bool Foam::Rosenbrock34::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/SIBS/SIBS.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -83,10 +83,8 @@ bool Foam::SIBS::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/Trapezoid/Trapezoid.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -59,10 +59,8 @@ bool Foam::Trapezoid::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/rodas23/rodas23.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -91,10 +91,8 @@ bool Foam::rodas23::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/rodas34/rodas34.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -116,10 +116,8 @@ bool Foam::rodas34::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/ODE/ODESolvers/seulex/seulex.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -231,10 +231,8 @@ bool Foam::seulex::resize()
return true; return true;
} }
else
{ return false;
return false;
}
} }

32
src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
View File

@ -423,30 +423,26 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
// Content. Defer to shapes. // Content. Defer to shapes.
return volumeType(shapes_.getVolumeType(*this, sample)); return volumeType(shapes_.getVolumeType(*this, sample));
} }
else
{
// Empty node. Cannot have 'mixed' as its type since not divided
// up and has no items inside it.
FatalErrorInFunction
<< "Sample:" << sample << " node:" << nodeI
<< " with bb:" << nodes_[nodeI].bb_ << nl
<< "Empty subnode has invalid volume type MIXED."
<< abort(FatalError);
return volumeType::UNKNOWN; // Empty node. Cannot have 'mixed' as its type since not divided
} // up and has no items inside it.
}
else
{
FatalErrorInFunction FatalErrorInFunction
<< "Sample:" << sample << " at node:" << nodeI << "Sample:" << sample << " node:" << nodeI
<< " octant:" << octant << " with bb:" << nodes_[nodeI].bb_ << nl
<< " with bb:" << nod.bb_.subBbox(octant) << nl << "Empty subnode has invalid volume type MIXED."
<< "Node has invalid volume type " << octantType
<< abort(FatalError); << abort(FatalError);
return volumeType::UNKNOWN; return volumeType::UNKNOWN;
} }
FatalErrorInFunction
<< "Sample:" << sample << " at node:" << nodeI
<< " octant:" << octant
<< " with bb:" << nod.bb_.subBbox(octant) << nl
<< "Node has invalid volume type " << octantType
<< abort(FatalError);
return volumeType::UNKNOWN;
} }

32
src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
View File

@ -441,30 +441,26 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
// Content. Defer to shapes. // Content. Defer to shapes.
return volumeType(shapes_.getVolumeType(*this, sample)); return volumeType(shapes_.getVolumeType(*this, sample));
} }
else
{
// Empty node. Cannot have 'mixed' as its type since not divided
// up and has no items inside it.
FatalErrorInFunction
<< "Sample:" << sample << " node:" << nodeI
<< " with bb:" << nodes_[nodeI].bb_ << nl
<< "Empty subnode has invalid volume type MIXED."
<< abort(FatalError);
return volumeType::UNKNOWN; // Empty node. Cannot have 'mixed' as its type since not divided
} // up and has no items inside it.
}
else
{
FatalErrorInFunction FatalErrorInFunction
<< "Sample:" << sample << " at node:" << nodeI << "Sample:" << sample << " node:" << nodeI
<< " octant:" << octant << " with bb:" << nodes_[nodeI].bb_ << nl
<< " with bb:" << nod.bb_.subBbox(octant) << nl << "Empty subnode has invalid volume type MIXED."
<< "Node has invalid volume type " << octantType
<< abort(FatalError); << abort(FatalError);
return volumeType::UNKNOWN; return volumeType::UNKNOWN;
} }
FatalErrorInFunction
<< "Sample:" << sample << " at node:" << nodeI
<< " octant:" << octant
<< " with bb:" << nod.bb_.subBbox(octant) << nl
<< "Node has invalid volume type " << octantType
<< abort(FatalError);
return volumeType::UNKNOWN;
} }

10
src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -33,7 +33,7 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(treeDataCell, 0); defineTypeNameAndDebug(treeDataCell, 0);
} }
@ -178,10 +178,8 @@ bool Foam::treeDataCell::overlaps
{ {
return cubeBb.overlaps(bbs_[index]); return cubeBb.overlaps(bbs_[index]);
} }
else
{ return cubeBb.overlaps(calcCellBb(cellLabels_[index]));
return cubeBb.overlaps(calcCellBb(cellLabels_[index]));
}
} }

14
src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2013 OpenFOAM Foundation | Copyright (C) 2011-2013 OpenFOAM Foundation
@ -48,17 +48,15 @@ Foam::Dictionary<T>::Dictionary(const Dictionary& dict)
template<class T> template<class T>
bool Foam::Dictionary<T>::erase(const word& keyword) bool Foam::Dictionary<T>::erase(const word& keyword)
{ {
T* tPtr = this->remove(keyword); T* ptr = this->remove(keyword);
if (tPtr) if (ptr)
{ {
delete tPtr; delete ptr;
return true; return true;
} }
else
{ return false;
return false;
}
} }

25
src/OpenFOAM/db/Callback/Callback.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011 OpenFOAM Foundation | Copyright (C) 2011 OpenFOAM Foundation
@ -66,10 +66,8 @@ bool Foam::Callback<CallbackType>::checkIn()
cbr_.append(static_cast<CallbackType*>(this)); cbr_.append(static_cast<CallbackType*>(this));
return true; return true;
} }
else
{ return false;
return false;
}
} }
@ -78,21 +76,12 @@ bool Foam::Callback<CallbackType>::checkOut()
{ {
if (Callback<CallbackType>::link::registered()) if (Callback<CallbackType>::link::registered())
{ {
CallbackType* cbPtr = cbr_.remove(static_cast<CallbackType*>(this)); CallbackType* ptr = cbr_.remove(static_cast<CallbackType*>(this));
if (cbPtr) return ptr;
{
return true;
}
else
{
return false;
}
}
else
{
return false;
} }
return false;
} }

8
src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
View File

@ -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) 2016-2018 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -248,10 +248,8 @@ Foam::Ostream& Foam::UOPstream::write(const char* str)
{ {
return write(nonWhiteChars); return write(nonWhiteChars);
} }
else
{ return *this;
return *this;
}
} }

48
src/OpenFOAM/db/dictionary/functionEntries/ifeqEntry/ifeqEntry.C
View File

@ -1,8 +1,8 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration |
\\ / A nd | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2018 OpenFOAM Foundation | Copyright (C) 2018 OpenFOAM Foundation
@ -109,10 +109,8 @@ Foam::token Foam::functionEntries::ifeqEntry::expand
// Re-form as a string token so we can compare to string // Re-form as a string token so we can compare to string
return token(keyword, t.lineNumber()); return token(keyword, t.lineNumber());
} }
else
{ return t;
return t;
}
} }
@ -134,10 +132,8 @@ Foam::token Foam::functionEntries::ifeqEntry::expand
{ {
return expand(dict, t.stringToken(), t); return expand(dict, t.stringToken(), t);
} }
else
{ return t;
return t;
}
} }
@ -173,10 +169,7 @@ bool Foam::functionEntries::ifeqEntry::equalToken
wordRe w2(t2.stringToken(), wordRe::DETECT); wordRe w2(t2.stringToken(), wordRe::DETECT);
return w2.match(t1.wordToken(), false); return w2.match(t1.wordToken(), false);
} }
else return false;
{
return false;
}
case token::STRING: case token::STRING:
if (eqType) if (eqType)
@ -190,11 +183,7 @@ bool Foam::functionEntries::ifeqEntry::equalToken
const wordRe w1(t1.stringToken(), wordRe::DETECT); const wordRe w1(t1.stringToken(), wordRe::DETECT);
return w1.match(t2.wordToken(), false); return w1.match(t2.wordToken(), false);
} }
else return false;
{
return false;
}
case token::VARIABLE: case token::VARIABLE:
case token::VERBATIMSTRING: case token::VERBATIMSTRING:
@ -206,10 +195,7 @@ bool Foam::functionEntries::ifeqEntry::equalToken
{ {
return t1.stringToken() == t2.wordToken(); return t1.stringToken() == t2.wordToken();
} }
else return false;
{
return false;
}
case token::LABEL: case token::LABEL:
if (eqType) if (eqType)
@ -220,10 +206,7 @@ bool Foam::functionEntries::ifeqEntry::equalToken
{ {
return t1.labelToken() == t2.scalarToken(); return t1.labelToken() == t2.scalarToken();
} }
else return false;
{
return false;
}
case token::FLOAT_SCALAR: case token::FLOAT_SCALAR:
if (eqType) if (eqType)
@ -234,10 +217,7 @@ bool Foam::functionEntries::ifeqEntry::equalToken
{ {
return t1.scalarToken() == t2.scalarToken(); return t1.scalarToken() == t2.scalarToken();
} }
else return false;
{
return false;
}
case token::DOUBLE_SCALAR: case token::DOUBLE_SCALAR:
if (eqType) if (eqType)
@ -248,10 +228,7 @@ bool Foam::functionEntries::ifeqEntry::equalToken
{ {
return t1.scalarToken() == t2.scalarToken(); return t1.scalarToken() == t2.scalarToken();
} }
else return false;
{
return false;
}
case token::COMPOUND: case token::COMPOUND:
return false; return false;
@ -259,6 +236,7 @@ bool Foam::functionEntries::ifeqEntry::equalToken
case token::ERROR: case token::ERROR:
return eqType; return eqType;
} }
return false; return false;
} }

6
src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C
View File

@ -102,10 +102,8 @@ bool Foam::functionObjects::regionFunctionObject::clearObject
return false; return false;
} }
} }
else
{ return true;
return true;
}
} }

9
src/OpenFOAM/db/regIOobject/regIOobject.C
View File

@ -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) 2018 OpenCFD Ltd. \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -247,6 +247,7 @@ Foam::label Foam::regIOobject::addWatch(const fileName& f)
watchIndices_.append(fileHandler().addWatch(f)); watchIndices_.append(fileHandler().addWatch(f));
} }
} }
return index; return index;
} }
@ -355,10 +356,8 @@ bool Foam::regIOobject::upToDate(const regIOobject& a) const
// My event number higher than a // My event number higher than a
return true; return true;
} }
else
{ return false;
return false;
}
} }

14
src/OpenFOAM/db/regIOobject/regIOobjectRead.C
View File

@ -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) 2015-2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2018 OpenFOAM Foundation | Copyright (C) 2011-2018 OpenFOAM Foundation
@ -78,10 +78,8 @@ bool Foam::regIOobject::readHeaderOk
{ {
return fileHandler().read(*this, masterOnly, format, typeName); return fileHandler().read(*this, masterOnly, format, typeName);
} }
else
{ return false;
return false;
}
} }
@ -296,10 +294,8 @@ bool Foam::regIOobject::readIfModified()
return read(); return read();
} }
else
{ return false;
return false;
}
} }

6
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -980,10 +980,8 @@ Foam::word Foam::GeometricField<Type, PatchField, GeoMesh>::select
{ {
return this->name() + "Final"; return this->name() + "Final";
} }
else
{ return this->name();
return this->name();
}
} }

8
src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2017-2018 OpenFOAM Foundation | Copyright (C) 2017-2018 OpenFOAM Foundation
@ -1052,10 +1052,8 @@ Foam::fileName Foam::fileOperation::processorsPath
return dir.path()/procsDir; return dir.path()/procsDir;
} }
else
{ return fileName::null;
return fileName::null;
}
} }

8
src/OpenFOAM/graph/curve/curveTools.C
View File

@ -109,10 +109,8 @@ bool interpolate
return true; return true;
} }
} }
else
{ return true;
return true;
}
} }
@ -170,8 +168,8 @@ bool Xinterpolate
vector D = p2 - p1; vector D = p2 - p1;
scalar lamda = (n.x() - p1.x())/D.x(); scalar lamda = (n.x() - p1.x())/D.x();
n.y() = p1.y() + lamda*D.y(); n.y() = p1.y() + lamda*D.y();
return false;
return false;
} }

8
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -688,10 +688,8 @@ bool Foam::GAMGAgglomeration::checkRestriction
return false; return false;
} }
else
{ return true;
return true;
}
} }

6
src/OpenFOAM/meshes/polyMesh/polyMesh.C
View File

@ -800,10 +800,8 @@ const Foam::fileName& Foam::polyMesh::dbDir() const
{ {
return parent().dbDir(); return parent().dbDir();
} }
else
{ return objectRegistry::dbDir();
return objectRegistry::dbDir();
}
} }

69
src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2012-2016 OpenFOAM Foundation | Copyright (C) 2012-2016 OpenFOAM Foundation
@ -157,15 +157,13 @@ bool Foam::polyMesh::checkFaceOrthogonality
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Non-orthogonality check OK." << endl;
}
return false; if (debug || report)
{
Info<< " Non-orthogonality check OK." << endl;
} }
return false;
} }
@ -259,15 +257,13 @@ bool Foam::polyMesh::checkFaceSkewness
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Max skewness = " << maxSkew << " OK." << endl;
}
return false; if (debug || report)
{
Info<< " Max skewness = " << maxSkew << " OK." << endl;
} }
return false;
} }
@ -395,15 +391,14 @@ bool Foam::polyMesh::checkEdgeAlignment
return true; return true;
} }
else
if (debug || report)
{ {
if (debug || report) Info<< " All edges aligned with or perpendicular to "
{ << "non-empty directions." << endl;
Info<< " All edges aligned with or perpendicular to "
<< "non-empty directions." << endl;
}
return false;
} }
return false;
} }
@ -475,14 +470,10 @@ bool Foam::polyMesh::checkCellDeterminant
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Cell determinant check OK." << endl;
}
return false; if (debug || report)
{
Info<< " Cell determinant check OK." << endl;
} }
return false; return false;
@ -570,14 +561,10 @@ bool Foam::polyMesh::checkFaceWeight
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Face interpolation weight check OK." << endl;
}
return false; if (debug || report)
{
Info<< " Face interpolation weight check OK." << endl;
} }
return false; return false;
@ -657,14 +644,10 @@ bool Foam::polyMesh::checkVolRatio
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Face volume ratio check OK." << endl;
}
return false; if (debug || report)
{
Info<< " Face volume ratio check OK." << endl;
} }
return false; return false;

14
src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2019 OpenFOAM Foundation | Copyright (C) 2011-2019 OpenFOAM Foundation
@ -488,15 +488,13 @@ bool Foam::polyMeshTetDecomposition::checkFaceTets
return true; return true;
} }
else
{
if (report)
{
Info<< " Face tets OK." << endl;
}
return false; if (report)
{
Info<< " Face tets OK." << endl;
} }
return false;
} }

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
View File

@ -1380,7 +1380,7 @@ bool Foam::cyclicPolyPatch::order
<< " Continuing with incorrect face ordering from now on!" << " Continuing with incorrect face ordering from now on!"
<< endl; << endl;
return false; return false;
} }

8
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -278,10 +278,8 @@ bool Foam::oldCyclicPolyPatch::getGeometricHalves
return false; return false;
} }
else
{ return true;
return true;
}
} }

269
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -88,16 +88,14 @@ bool Foam::primitiveMesh::checkClosedBoundary
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Boundary openness " << openness << " OK."
<< endl;
}
return false; if (debug || report)
{
Info<< " Boundary openness " << openness << " OK."
<< endl;
} }
return false;
} }
@ -297,17 +295,15 @@ bool Foam::primitiveMesh::checkFaceAreas
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Minimum face area = " << minArea
<< ". Maximum face area = " << maxArea
<< ". Face area magnitudes OK." << endl;
}
return false; if (debug || report)
{
Info<< " Minimum face area = " << minArea
<< ". Maximum face area = " << maxArea
<< ". Face area magnitudes OK." << endl;
} }
return false;
} }
@ -366,18 +362,16 @@ bool Foam::primitiveMesh::checkCellVolumes
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Min volume = " << minVolume
<< ". Max volume = " << maxVolume
<< ". Total volume = " << gSum(vols)
<< ". Cell volumes OK." << endl;
}
return false; if (debug || report)
{
Info<< " Min volume = " << minVolume
<< ". Max volume = " << maxVolume
<< ". Total volume = " << gSum(vols)
<< ". Cell volumes OK." << endl;
} }
return false;
} }
@ -479,15 +473,13 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Non-orthogonality check OK." << endl;
}
return false; if (debug || report)
{
Info<< " Non-orthogonality check OK." << endl;
} }
return false;
} }
@ -581,15 +573,13 @@ bool Foam::primitiveMesh::checkFacePyramids
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Face pyramids OK." << endl;
}
return false; if (debug || report)
{
Info<< " Face pyramids OK." << endl;
} }
return false;
} }
@ -654,15 +644,13 @@ bool Foam::primitiveMesh::checkFaceSkewness
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Max skewness = " << maxSkew << " OK." << endl;
}
return false; if (debug || report)
{
Info<< " Max skewness = " << maxSkew << " OK." << endl;
} }
return false;
} }
@ -734,15 +722,13 @@ bool Foam::primitiveMesh::checkFaceAngles
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " All angles in faces OK." << endl;
}
return false; if (debug || report)
{
Info<< " All angles in faces OK." << endl;
} }
return false;
} }
@ -839,15 +825,13 @@ bool Foam::primitiveMesh::checkFaceFlatness
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " All face flatness OK." << endl;
}
return false; if (debug || report)
{
Info<< " All face flatness OK." << endl;
} }
return false;
} }
@ -950,14 +934,10 @@ bool Foam::primitiveMesh::checkConcaveCells
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Concave cell check OK." << endl;
}
return false; if (debug || report)
{
Info<< " Concave cell check OK." << endl;
} }
return false; return false;
@ -1115,15 +1095,13 @@ bool Foam::primitiveMesh::checkUpperTriangular
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Upper triangular ordering OK." << endl;
}
return false; if (debug || report)
{
Info<< " Upper triangular ordering OK." << endl;
} }
return false;
} }
@ -1213,15 +1191,13 @@ bool Foam::primitiveMesh::checkCellsZipUp
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Topological cell zip-up check OK." << endl;
}
return false; if (debug || report)
{
Info<< " Topological cell zip-up check OK." << endl;
} }
return false;
} }
@ -1286,15 +1262,13 @@ bool Foam::primitiveMesh::checkFaceVertices
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Face vertices OK." << endl;
}
return false; if (debug || report)
{
Info<< " Face vertices OK." << endl;
} }
return false;
} }
@ -1358,15 +1332,13 @@ bool Foam::primitiveMesh::checkPoints
return true; return true;
} }
else
{
if (debug || report)
{
Info<< " Point usage OK." << endl;
}
return false; if (debug || report)
{
Info<< " Point usage OK." << endl;
} }
return false;
} }
@ -1670,15 +1642,13 @@ bool Foam::primitiveMesh::checkFaceFaces
return false; //return true; return false; //return true;
} }
else
{
if (debug || report)
{
Info<< " Face-face connectivity OK." << endl;
}
return false; if (debug || report)
{
Info<< " Face-face connectivity OK." << endl;
} }
return false;
} }
@ -1850,66 +1820,63 @@ bool Foam::primitiveMesh::checkConcaveCells
bool Foam::primitiveMesh::checkTopology(const bool report) const bool Foam::primitiveMesh::checkTopology(const bool report) const
{ {
label noFailedChecks = 0; label nFailedChecks = 0;
if (checkPoints(report)) noFailedChecks++; if (checkPoints(report)) ++nFailedChecks;
if (checkUpperTriangular(report)) noFailedChecks++; if (checkUpperTriangular(report)) ++nFailedChecks;
if (checkCellsZipUp(report)) noFailedChecks++; if (checkCellsZipUp(report)) ++nFailedChecks;
if (checkFaceVertices(report)) noFailedChecks++; if (checkFaceVertices(report)) ++nFailedChecks;
if (checkFaceFaces(report)) noFailedChecks++; if (checkFaceFaces(report)) ++nFailedChecks;
if (noFailedChecks == 0) if (nFailedChecks)
{ {
if (debug || report) if (debug || report)
{ {
Info<< " Mesh topology OK." << endl; Info<< " Failed " << nFailedChecks
}
return false;
}
else
{
if (debug || report)
{
Info<< " Failed " << noFailedChecks
<< " mesh topology checks." << endl; << " mesh topology checks." << endl;
} }
return true; return true;
} }
if (debug || report)
{
Info<< " Mesh topology OK." << endl;
}
return false;
} }
bool Foam::primitiveMesh::checkGeometry(const bool report) const bool Foam::primitiveMesh::checkGeometry(const bool report) const
{ {
label noFailedChecks = 0; label nFailedChecks = 0;
if (checkClosedBoundary(report)) noFailedChecks++; if (checkClosedBoundary(report)) ++nFailedChecks;
if (checkClosedCells(report)) noFailedChecks++; if (checkClosedCells(report)) ++nFailedChecks;
if (checkFaceAreas(report)) noFailedChecks++; if (checkFaceAreas(report)) ++nFailedChecks;
if (checkCellVolumes(report)) noFailedChecks++; if (checkCellVolumes(report)) ++nFailedChecks;
if (checkFaceOrthogonality(report)) noFailedChecks++; if (checkFaceOrthogonality(report)) ++nFailedChecks;
if (checkFacePyramids(report)) noFailedChecks++; if (checkFacePyramids(report)) ++nFailedChecks;
if (checkFaceSkewness(report)) noFailedChecks++; if (checkFaceSkewness(report)) ++nFailedChecks;
if (noFailedChecks == 0) if (nFailedChecks)
{ {
if (debug || report) if (debug || report)
{ {
Info<< " Mesh geometry OK." << endl; Info<< " Failed " << nFailedChecks
}
return false;
}
else
{
if (debug || report)
{
Info<< " Failed " << noFailedChecks
<< " mesh geometry checks." << endl; << " mesh geometry checks." << endl;
} }
return true; return true;
} }
if (debug || report)
{
Info<< " Mesh geometry OK." << endl;
}
return false;
} }
@ -1920,27 +1887,25 @@ bool Foam::primitiveMesh::checkMesh(const bool report) const
InfoInFunction << "Checking primitiveMesh" << endl; InfoInFunction << "Checking primitiveMesh" << endl;
} }
label noFailedChecks = checkTopology(report) + checkGeometry(report); label nFailedChecks = checkTopology(report) + checkGeometry(report);
if (noFailedChecks == 0) if (nFailedChecks)
{ {
if (debug || report) if (debug || report)
{ {
Info<< "Mesh OK." << endl; Info<< " Failed " << nFailedChecks
}
return false;
}
else
{
if (debug || report)
{
Info<< " Failed " << noFailedChecks
<< " mesh checks." << endl; << " mesh checks." << endl;
} }
return true; return true;
} }
if (debug || report)
{
Info<< "Mesh OK." << endl;
}
return false;
} }

17
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckEdgeLength.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -87,17 +87,14 @@ bool Foam::primitiveMesh::checkEdgeLength
return true; return true;
} }
else
{
if (report)
{
Info<< " Min/max edge length = "
<< sqrt(minLenSqr) << " " << sqrt(maxLenSqr)
<< " OK." << endl;
}
return false; if (report)
{
Info<< " Min/max edge length = "
<< sqrt(minLenSqr) << " " << sqrt(maxLenSqr) << " OK." << endl;
} }
return false;
} }

8
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckPointNearness.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011 OpenFOAM Foundation | Copyright (C) 2011 OpenFOAM Foundation
@ -101,10 +101,8 @@ bool Foam::primitiveMesh::checkPointNearness
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/OpenFOAM/primitives/enums/NamedEnum.C
View File

@ -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) 2017 OpenCFD Ltd. \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation | Copyright (C) 2011-2015 OpenFOAM Foundation
@ -158,10 +158,8 @@ EnumType Foam::NamedEnum<EnumType, nEnum>::lookupOrDefault
{ {
return lookup(key, dict); return lookup(key, dict);
} }
else
{ return deflt;
return deflt;
}
} }

8
src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -445,10 +445,8 @@ bool Foam::globalIndexAndTransform::uniqueTransform
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015-2017 OpenFOAM Foundation | Copyright (C) 2015-2017 OpenFOAM Foundation
@ -95,10 +95,8 @@ bool Foam::EddyDiffusivity<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

20
src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C
View File

@ -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) 2018 OpenCFD Ltd. \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2014-2015 OpenFOAM Foundation | Copyright (C) 2014-2015 OpenFOAM Foundation
@ -92,10 +92,8 @@ bool buoyantKEpsilon<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }
@ -123,10 +121,8 @@ buoyantKEpsilon<BasicTurbulenceModel>::kSource() const
{ {
return -fvm::SuSp(Gcoef(), this->k_); return -fvm::SuSp(Gcoef(), this->k_);
} }
else
{ return kEpsilon<BasicTurbulenceModel>::kSource();
return kEpsilon<BasicTurbulenceModel>::kSource();
}
} }
@ -150,10 +146,8 @@ buoyantKEpsilon<BasicTurbulenceModel>::epsilonSource() const
return -fvm::SuSp(this->C1_*tanh(mag(v)/u)*Gcoef(), this->epsilon_); return -fvm::SuSp(this->C1_*tanh(mag(v)/u)*Gcoef(), this->epsilon_);
} }
else
{ return kEpsilon<BasicTurbulenceModel>::epsilonSource();
return kEpsilon<BasicTurbulenceModel>::epsilonSource();
}
} }

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
View File

@ -200,10 +200,8 @@ bool LamBremhorstKE::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -363,10 +363,8 @@ bool LienCubicKE::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -249,10 +249,8 @@ bool LienLeschziner::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -248,10 +248,8 @@ bool ShihQuadraticKE::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -588,10 +588,8 @@ bool kkLOmega::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -231,10 +231,8 @@ bool qZeta::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -115,10 +115,8 @@ bool NicenoKEqn<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -92,10 +92,8 @@ bool SmagorinskyZhang<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -92,10 +92,8 @@ bool continuousGasKEqn<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -126,10 +126,8 @@ bool LaheyKEpsilon<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation | Copyright (C) 2013-2017 OpenFOAM Foundation
@ -107,10 +107,8 @@ bool continuousGasKEpsilon<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

9
src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2014-2017 OpenFOAM Foundation | Copyright (C) 2014-2017 OpenFOAM Foundation
@ -93,12 +93,11 @@ bool kOmegaSSTSato<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }
template<class BasicTurbulenceModel> template<class BasicTurbulenceModel>
const PhaseCompressibleTurbulenceModel const PhaseCompressibleTurbulenceModel
< <

8
src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
View File

@ -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) 2016-2017 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2017, 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation | Copyright (C) 2011-2015 OpenFOAM Foundation
@ -473,10 +473,8 @@ bool kOmegaSSTBase<BasicEddyViscosityModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
View File

@ -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) 2015 OpenCFD Ltd. \\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -166,10 +166,8 @@ bool SpalartAllmarasDDES<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
View File

@ -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) 2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -438,10 +438,8 @@ bool SpalartAllmarasDES<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
View File

@ -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) 2015-2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation | Copyright (C) 2011-2015 OpenFOAM Foundation
@ -245,10 +245,8 @@ bool SpalartAllmarasIDDES<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C
View File

@ -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) 2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation | Copyright (C) 2015 OpenFOAM Foundation
@ -168,10 +168,8 @@ bool kOmegaSSTDDES<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C
View File

@ -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) 2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation | Copyright (C) 2015 OpenFOAM Foundation
@ -169,10 +169,8 @@ bool kOmegaSSTDES<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
View File

@ -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) 2015 OpenCFD Ltd. \\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation | Copyright (C) 2015 OpenFOAM Foundation
@ -244,10 +244,8 @@ bool kOmegaSSTIDDES<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -134,10 +134,8 @@ bool DeardorffDiffStress<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation | Copyright (C) 2013-2017 OpenFOAM Foundation
@ -192,10 +192,8 @@ bool Foam::LESModel<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

12
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation | Copyright (C) 2011-2015 OpenFOAM Foundation
@ -52,12 +52,10 @@ inline bool Foam::LESModels::smoothDelta::deltaData::update
// Something changed. Let caller know. // Something changed. Let caller know.
return true; return true;
} }
else
{ // Neighbour is not too big for me or change is too small
// Neighbour is not too big for me or change is too small // Nothing changed.
// Nothing changed. return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
View File

@ -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) 2016 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation | Copyright (C) 2013-2017 OpenFOAM Foundation
@ -85,10 +85,8 @@ bool LESeddyViscosity<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -133,10 +133,8 @@ bool Smagorinsky<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015-2017 OpenFOAM Foundation | Copyright (C) 2015-2017 OpenFOAM Foundation
@ -164,10 +164,8 @@ bool WALE<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -213,10 +213,8 @@ bool dynamicKEqn<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -145,10 +145,8 @@ bool dynamicLagrangian<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

6
src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
View File

@ -133,10 +133,8 @@ bool kEqn<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -235,10 +235,8 @@ bool LRR<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -229,10 +229,8 @@ bool LaunderSharmaKE<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation | Copyright (C) 2013-2017 OpenFOAM Foundation
@ -182,10 +182,8 @@ bool Foam::RASModel<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -232,10 +232,8 @@ bool RNGkEpsilon<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
View File

@ -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) 2018 OpenCFD Ltd \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015-2016 OpenFOAM Foundation | Copyright (C) 2015-2016 OpenFOAM Foundation
@ -245,10 +245,8 @@ bool SSG<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

6
src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
View File

@ -284,10 +284,8 @@ bool SpalartAllmaras<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -212,10 +212,8 @@ bool kEpsilon<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

8
src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
View File

@ -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 | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -172,10 +172,8 @@ bool kOmega<BasicTurbulenceModel>::read()
return true; return true;
} }
else
{ return false;
return false;
}
} }

Some files were not shown because too many files have changed in this diff Show More