STYLE: reduced nesting on return branching

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

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -96,11 +96,9 @@ bool PDRkEpsilon::read()
C4_.readIfPresent(coeffDict_);
return true;
}
else
{
return false;
}
}
void PDRkEpsilon::correct()

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2017 OpenFOAM Foundation
@ -141,11 +141,9 @@ bool Foam::surfaceTensionModels::liquidProperties::writeData
{
return os.good();
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation
@ -382,11 +382,9 @@ bool Foam::twoPhaseMixtureThermo::read()
{
return interfaceProperties::read();
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2014-2015 OpenFOAM Foundation
@ -143,16 +143,10 @@ bool Foam::incompressibleTwoPhaseInteractingMixture::read()
return true;
}
else
{
}
return false;
}
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -541,11 +541,9 @@ bool Foam::radiation::laserDTRM::read()
{
return true;
}
else
{
return false;
}
}
void Foam::radiation::laserDTRM::calculate()

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -99,11 +99,9 @@ bool Foam::temperaturePhaseChangeTwoPhaseMixture::read()
{
return true;
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -112,7 +112,6 @@ Foam::thermoIncompressibleTwoPhaseMixture::thermoIncompressibleTwoPhaseMixture
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::thermoIncompressibleTwoPhaseMixture::read()
{
if (incompressibleTwoPhaseMixture::read())
@ -131,11 +130,9 @@ bool Foam::thermoIncompressibleTwoPhaseMixture::read()
return true;
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -239,16 +239,10 @@ bool Foam::incompressibleThreePhaseMixture::read()
return true;
}
else
{
}
return false;
}
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -116,11 +116,9 @@ bool Foam::phaseChangeTwoPhaseMixtures::Kunz::read()
return true;
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -111,11 +111,9 @@ bool Foam::phaseChangeTwoPhaseMixtures::Merkle::read()
return true;
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -162,11 +162,9 @@ bool Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::read()
return true;
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -90,11 +90,9 @@ bool Foam::phase::read(const dictionary& phaseDict)
return true;
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -211,11 +211,9 @@ bool Foam::RASModels::kineticTheoryModel::read()
return true;
}
else
{
return false;
}
}
Foam::tmp<Foam::volScalarField>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -211,11 +211,9 @@ bool Foam::RASModels::kineticTheoryModel::read()
return true;
}
else
{
return false;
}
}
Foam::tmp<Foam::volScalarField>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -93,11 +93,9 @@ bool limitRefinementLevel
return true;
}
else
{
return false;
}
}
int main(int argc, char *argv[])

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -417,15 +417,13 @@ bool limitRefinementLevel
}
return true;
}
else
{
Info<< "Added no additional cells"
<< " to satisfy 1:" << limitDiff << " refinement level"
<< endl;
return false;
}
}
// Do all refinement (i.e. refCells) according to refineDict and update

View File

@ -359,11 +359,9 @@ bool splitCell
return true;
}
else
{
return false;
}
}
// Collects cuts for all cells in cellSet

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2012-2015 OpenFOAM Foundation
@ -149,15 +149,11 @@ bool Foam::conformalVoronoiMesh::regionIsInside
{
return meshableRegionA;
}
else
{
WarningInFunction
<< ""
<< endl;
WarningInFunction << endl;
return false;
}
}
void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -89,11 +89,9 @@ inline bool Foam::CV2D::insertMirrorPoint
insertPoint(mirrorPoint, Vb::MIRROR_POINT);
return true;
}
else
{
return false;
}
}
inline void Foam::CV2D::insertPointPair

View File

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

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2015 OpenFOAM Foundation
@ -147,11 +147,9 @@ bool Foam::CV2D::insertPointPairAtIntersection
insertPointPair(vit, interPoint, interTri, interHitSurface);
return true;
}
else
{
return false;
}
}
Foam::label Foam::CV2D::insertBoundaryConformPointPairs

View File

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

View File

@ -324,11 +324,9 @@ bool isSliver
return true;
}
else
{
return false;
}
}
// Mark all faces that are going to be collapsed.

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -666,13 +666,10 @@ bool splitBorderEdges
return true;
}
else
{
Info<< "No edges to be split" <<nl << endl;
Info<< "No edges to be split" <<nl << endl;
return false;
}
}

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -59,11 +59,9 @@ bool Foam::Euler::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::Euler::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -69,11 +69,9 @@ bool Foam::EulerSI::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::EulerSI::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -107,11 +107,9 @@ bool Foam::ODESolver::resize()
return true;
}
else
{
return false;
}
}
void Foam::ODESolver::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -105,11 +105,9 @@ bool Foam::RKCK45::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::RKCK45::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -110,11 +110,9 @@ bool Foam::RKDP45::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::RKDP45::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -106,11 +106,9 @@ bool Foam::RKF45::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::RKF45::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -85,11 +85,9 @@ bool Foam::Rosenbrock12::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::Rosenbrock12::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -99,11 +99,9 @@ bool Foam::Rosenbrock23::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::Rosenbrock23::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -145,11 +145,9 @@ bool Foam::Rosenbrock34::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::Rosenbrock34::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -83,11 +83,9 @@ bool Foam::SIBS::resize()
return true;
}
else
{
return false;
}
}
void Foam::SIBS::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -59,11 +59,9 @@ bool Foam::Trapezoid::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::Trapezoid::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -91,11 +91,9 @@ bool Foam::rodas23::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::rodas23::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -116,11 +116,9 @@ bool Foam::rodas34::resize()
return true;
}
else
{
return false;
}
}
Foam::scalar Foam::rodas34::solve

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -231,11 +231,9 @@ bool Foam::seulex::resize()
return true;
}
else
{
return false;
}
}
void Foam::seulex::solve

View File

@ -423,8 +423,7 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
// Content. Defer to shapes.
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
@ -435,9 +434,7 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
return volumeType::UNKNOWN;
}
}
else
{
FatalErrorInFunction
<< "Sample:" << sample << " at node:" << nodeI
<< " octant:" << octant
@ -447,7 +444,6 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
return volumeType::UNKNOWN;
}
}
template<class Type>

View File

@ -441,8 +441,7 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
// Content. Defer to shapes.
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
@ -453,9 +452,7 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
return volumeType::UNKNOWN;
}
}
else
{
FatalErrorInFunction
<< "Sample:" << sample << " at node:" << nodeI
<< " octant:" << octant
@ -465,7 +462,6 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
return volumeType::UNKNOWN;
}
}
template<class Type>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -178,11 +178,9 @@ bool Foam::treeDataCell::overlaps
{
return cubeBb.overlaps(bbs_[index]);
}
else
{
return cubeBb.overlaps(calcCellBb(cellLabels_[index]));
}
}
bool Foam::treeDataCell::contains

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2013 OpenFOAM Foundation
@ -48,18 +48,16 @@ Foam::Dictionary<T>::Dictionary(const Dictionary& dict)
template<class T>
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;
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011 OpenFOAM Foundation
@ -66,11 +66,9 @@ bool Foam::Callback<CallbackType>::checkIn()
cbr_.append(static_cast<CallbackType*>(this));
return true;
}
else
{
return false;
}
}
template<class CallbackType>
@ -78,22 +76,13 @@ bool Foam::Callback<CallbackType>::checkOut()
{
if (Callback<CallbackType>::link::registered())
{
CallbackType* cbPtr = cbr_.remove(static_cast<CallbackType*>(this));
CallbackType* ptr = cbr_.remove(static_cast<CallbackType*>(this));
if (cbPtr)
{
return true;
return ptr;
}
else
{
return false;
}
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -248,11 +248,9 @@ Foam::Ostream& Foam::UOPstream::write(const char* str)
{
return write(nonWhiteChars);
}
else
{
return *this;
}
}
Foam::Ostream& Foam::UOPstream::write(const word& str)

View File

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

View File

@ -102,11 +102,9 @@ bool Foam::functionObjects::regionFunctionObject::clearObject
return false;
}
}
else
{
return true;
}
}
void Foam::functionObjects::regionFunctionObject::clearObjects

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -247,6 +247,7 @@ Foam::label Foam::regIOobject::addWatch(const fileName& f)
watchIndices_.append(fileHandler().addWatch(f));
}
}
return index;
}
@ -355,11 +356,9 @@ bool Foam::regIOobject::upToDate(const regIOobject& a) const
// My event number higher than a
return true;
}
else
{
return false;
}
}
bool Foam::regIOobject::upToDate

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2018 OpenFOAM Foundation
@ -78,11 +78,9 @@ bool Foam::regIOobject::readHeaderOk
{
return fileHandler().read(*this, masterOnly, format, typeName);
}
else
{
return false;
}
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -296,11 +294,9 @@ bool Foam::regIOobject::readIfModified()
return read();
}
else
{
return false;
}
}
// ************************************************************************* //

View File

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

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2017-2018 OpenFOAM Foundation
@ -1052,11 +1052,9 @@ Foam::fileName Foam::fileOperation::processorsPath
return dir.path()/procsDir;
}
else
{
return fileName::null;
}
}
Foam::label Foam::fileOperation::splitProcessorPath

View File

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

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -688,11 +688,9 @@ bool Foam::GAMGAgglomeration::checkRestriction
return false;
}
else
{
return true;
}
}
// ************************************************************************* //

View File

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

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2012-2016 OpenFOAM Foundation
@ -157,8 +157,7 @@ bool Foam::polyMesh::checkFaceOrthogonality
return true;
}
else
{
if (debug || report)
{
Info<< " Non-orthogonality check OK." << endl;
@ -166,7 +165,6 @@ bool Foam::polyMesh::checkFaceOrthogonality
return false;
}
}
bool Foam::polyMesh::checkFaceSkewness
@ -259,8 +257,7 @@ bool Foam::polyMesh::checkFaceSkewness
return true;
}
else
{
if (debug || report)
{
Info<< " Max skewness = " << maxSkew << " OK." << endl;
@ -268,7 +265,6 @@ bool Foam::polyMesh::checkFaceSkewness
return false;
}
}
bool Foam::polyMesh::checkEdgeAlignment
@ -395,16 +391,15 @@ bool Foam::polyMesh::checkEdgeAlignment
return true;
}
else
{
if (debug || report)
{
Info<< " All edges aligned with or perpendicular to "
<< "non-empty directions." << endl;
}
return false;
}
}
bool Foam::polyMesh::checkCellDeterminant
@ -475,8 +470,7 @@ bool Foam::polyMesh::checkCellDeterminant
return true;
}
else
{
if (debug || report)
{
Info<< " Cell determinant check OK." << endl;
@ -485,9 +479,6 @@ bool Foam::polyMesh::checkCellDeterminant
return false;
}
return false;
}
bool Foam::polyMesh::checkFaceWeight
(
@ -570,8 +561,7 @@ bool Foam::polyMesh::checkFaceWeight
return true;
}
else
{
if (debug || report)
{
Info<< " Face interpolation weight check OK." << endl;
@ -580,9 +570,6 @@ bool Foam::polyMesh::checkFaceWeight
return false;
}
return false;
}
bool Foam::polyMesh::checkVolRatio
(
@ -657,8 +644,7 @@ bool Foam::polyMesh::checkVolRatio
return true;
}
else
{
if (debug || report)
{
Info<< " Face volume ratio check OK." << endl;
@ -667,9 +653,6 @@ bool Foam::polyMesh::checkVolRatio
return false;
}
return false;
}
bool Foam::polyMesh::checkFaceOrthogonality
(

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2019 OpenFOAM Foundation
@ -488,8 +488,7 @@ bool Foam::polyMeshTetDecomposition::checkFaceTets
return true;
}
else
{
if (report)
{
Info<< " Face tets OK." << endl;
@ -497,7 +496,6 @@ bool Foam::polyMeshTetDecomposition::checkFaceTets
return false;
}
}
Foam::List<Foam::tetIndices> Foam::polyMeshTetDecomposition::faceTetIndices

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -278,11 +278,9 @@ bool Foam::oldCyclicPolyPatch::getGeometricHalves
return false;
}
else
{
return true;
}
}
void Foam::oldCyclicPolyPatch::getCentresAndAnchors

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -88,8 +88,7 @@ bool Foam::primitiveMesh::checkClosedBoundary
return true;
}
else
{
if (debug || report)
{
Info<< " Boundary openness " << openness << " OK."
@ -98,7 +97,6 @@ bool Foam::primitiveMesh::checkClosedBoundary
return false;
}
}
bool Foam::primitiveMesh::checkClosedCells
@ -297,8 +295,7 @@ bool Foam::primitiveMesh::checkFaceAreas
return true;
}
else
{
if (debug || report)
{
Info<< " Minimum face area = " << minArea
@ -308,7 +305,6 @@ bool Foam::primitiveMesh::checkFaceAreas
return false;
}
}
bool Foam::primitiveMesh::checkCellVolumes
@ -366,8 +362,7 @@ bool Foam::primitiveMesh::checkCellVolumes
return true;
}
else
{
if (debug || report)
{
Info<< " Min volume = " << minVolume
@ -378,7 +373,6 @@ bool Foam::primitiveMesh::checkCellVolumes
return false;
}
}
bool Foam::primitiveMesh::checkFaceOrthogonality
@ -479,8 +473,7 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
return true;
}
else
{
if (debug || report)
{
Info<< " Non-orthogonality check OK." << endl;
@ -488,7 +481,6 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
return false;
}
}
bool Foam::primitiveMesh::checkFacePyramids
@ -581,8 +573,7 @@ bool Foam::primitiveMesh::checkFacePyramids
return true;
}
else
{
if (debug || report)
{
Info<< " Face pyramids OK." << endl;
@ -590,7 +581,6 @@ bool Foam::primitiveMesh::checkFacePyramids
return false;
}
}
bool Foam::primitiveMesh::checkFaceSkewness
@ -654,8 +644,7 @@ bool Foam::primitiveMesh::checkFaceSkewness
return true;
}
else
{
if (debug || report)
{
Info<< " Max skewness = " << maxSkew << " OK." << endl;
@ -663,7 +652,6 @@ bool Foam::primitiveMesh::checkFaceSkewness
return false;
}
}
bool Foam::primitiveMesh::checkFaceAngles
@ -734,8 +722,7 @@ bool Foam::primitiveMesh::checkFaceAngles
return true;
}
else
{
if (debug || report)
{
Info<< " All angles in faces OK." << endl;
@ -743,7 +730,6 @@ bool Foam::primitiveMesh::checkFaceAngles
return false;
}
}
bool Foam::primitiveMesh::checkFaceFlatness
@ -839,8 +825,7 @@ bool Foam::primitiveMesh::checkFaceFlatness
return true;
}
else
{
if (debug || report)
{
Info<< " All face flatness OK." << endl;
@ -848,7 +833,6 @@ bool Foam::primitiveMesh::checkFaceFlatness
return false;
}
}
bool Foam::primitiveMesh::checkConcaveCells
@ -950,8 +934,7 @@ bool Foam::primitiveMesh::checkConcaveCells
return true;
}
else
{
if (debug || report)
{
Info<< " Concave cell check OK." << endl;
@ -960,9 +943,6 @@ bool Foam::primitiveMesh::checkConcaveCells
return false;
}
return false;
}
bool Foam::primitiveMesh::checkUpperTriangular
(
@ -1115,8 +1095,7 @@ bool Foam::primitiveMesh::checkUpperTriangular
return true;
}
else
{
if (debug || report)
{
Info<< " Upper triangular ordering OK." << endl;
@ -1124,7 +1103,6 @@ bool Foam::primitiveMesh::checkUpperTriangular
return false;
}
}
bool Foam::primitiveMesh::checkCellsZipUp
@ -1213,8 +1191,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
return true;
}
else
{
if (debug || report)
{
Info<< " Topological cell zip-up check OK." << endl;
@ -1222,7 +1199,6 @@ bool Foam::primitiveMesh::checkCellsZipUp
return false;
}
}
bool Foam::primitiveMesh::checkFaceVertices
@ -1286,8 +1262,7 @@ bool Foam::primitiveMesh::checkFaceVertices
return true;
}
else
{
if (debug || report)
{
Info<< " Face vertices OK." << endl;
@ -1295,7 +1270,6 @@ bool Foam::primitiveMesh::checkFaceVertices
return false;
}
}
bool Foam::primitiveMesh::checkPoints
@ -1358,8 +1332,7 @@ bool Foam::primitiveMesh::checkPoints
return true;
}
else
{
if (debug || report)
{
Info<< " Point usage OK." << endl;
@ -1367,7 +1340,6 @@ bool Foam::primitiveMesh::checkPoints
return false;
}
}
bool Foam::primitiveMesh::checkDuplicateFaces
@ -1670,8 +1642,7 @@ bool Foam::primitiveMesh::checkFaceFaces
return false; //return true;
}
else
{
if (debug || report)
{
Info<< " Face-face connectivity OK." << endl;
@ -1679,7 +1650,6 @@ bool Foam::primitiveMesh::checkFaceFaces
return false;
}
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
@ -1850,16 +1820,25 @@ bool Foam::primitiveMesh::checkConcaveCells
bool Foam::primitiveMesh::checkTopology(const bool report) const
{
label noFailedChecks = 0;
label nFailedChecks = 0;
if (checkPoints(report)) noFailedChecks++;
if (checkUpperTriangular(report)) noFailedChecks++;
if (checkCellsZipUp(report)) noFailedChecks++;
if (checkFaceVertices(report)) noFailedChecks++;
if (checkFaceFaces(report)) noFailedChecks++;
if (checkPoints(report)) ++nFailedChecks;
if (checkUpperTriangular(report)) ++nFailedChecks;
if (checkCellsZipUp(report)) ++nFailedChecks;
if (checkFaceVertices(report)) ++nFailedChecks;
if (checkFaceFaces(report)) ++nFailedChecks;
if (noFailedChecks == 0)
if (nFailedChecks)
{
if (debug || report)
{
Info<< " Failed " << nFailedChecks
<< " mesh topology checks." << endl;
}
return true;
}
if (debug || report)
{
Info<< " Mesh topology OK." << endl;
@ -1867,49 +1846,37 @@ bool Foam::primitiveMesh::checkTopology(const bool report) const
return false;
}
else
{
if (debug || report)
{
Info<< " Failed " << noFailedChecks
<< " mesh topology checks." << endl;
}
return true;
}
}
bool Foam::primitiveMesh::checkGeometry(const bool report) const
{
label noFailedChecks = 0;
label nFailedChecks = 0;
if (checkClosedBoundary(report)) noFailedChecks++;
if (checkClosedCells(report)) noFailedChecks++;
if (checkFaceAreas(report)) noFailedChecks++;
if (checkCellVolumes(report)) noFailedChecks++;
if (checkFaceOrthogonality(report)) noFailedChecks++;
if (checkFacePyramids(report)) noFailedChecks++;
if (checkFaceSkewness(report)) noFailedChecks++;
if (checkClosedBoundary(report)) ++nFailedChecks;
if (checkClosedCells(report)) ++nFailedChecks;
if (checkFaceAreas(report)) ++nFailedChecks;
if (checkCellVolumes(report)) ++nFailedChecks;
if (checkFaceOrthogonality(report)) ++nFailedChecks;
if (checkFacePyramids(report)) ++nFailedChecks;
if (checkFaceSkewness(report)) ++nFailedChecks;
if (noFailedChecks == 0)
if (nFailedChecks)
{
if (debug || report)
{
Info<< " Mesh geometry OK." << endl;
}
return false;
}
else
{
if (debug || report)
{
Info<< " Failed " << noFailedChecks
Info<< " Failed " << nFailedChecks
<< " mesh geometry checks." << endl;
}
return true;
}
if (debug || report)
{
Info<< " Mesh geometry OK." << endl;
}
return false;
}
@ -1920,10 +1887,19 @@ bool Foam::primitiveMesh::checkMesh(const bool report) const
InfoInFunction << "Checking primitiveMesh" << endl;
}
label noFailedChecks = checkTopology(report) + checkGeometry(report);
label nFailedChecks = checkTopology(report) + checkGeometry(report);
if (noFailedChecks == 0)
if (nFailedChecks)
{
if (debug || report)
{
Info<< " Failed " << nFailedChecks
<< " mesh checks." << endl;
}
return true;
}
if (debug || report)
{
Info<< "Mesh OK." << endl;
@ -1931,17 +1907,6 @@ bool Foam::primitiveMesh::checkMesh(const bool report) const
return false;
}
else
{
if (debug || report)
{
Info<< " Failed " << noFailedChecks
<< " mesh checks." << endl;
}
return true;
}
}
Foam::scalar Foam::primitiveMesh::setClosedThreshold(const scalar val)

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -87,18 +87,15 @@ bool Foam::primitiveMesh::checkEdgeLength
return true;
}
else
{
if (report)
{
Info<< " Min/max edge length = "
<< sqrt(minLenSqr) << " " << sqrt(maxLenSqr)
<< " OK." << endl;
<< sqrt(minLenSqr) << " " << sqrt(maxLenSqr) << " OK." << endl;
}
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011 OpenFOAM Foundation
@ -101,11 +101,9 @@ bool Foam::primitiveMesh::checkPointNearness
return true;
}
else
{
return false;
}
}
// ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation
@ -158,11 +158,9 @@ EnumType Foam::NamedEnum<EnumType, nEnum>::lookupOrDefault
{
return lookup(key, dict);
}
else
{
return deflt;
}
}
template<class EnumType, int nEnum>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -445,11 +445,9 @@ bool Foam::globalIndexAndTransform::uniqueTransform
return true;
}
else
{
return false;
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015-2017 OpenFOAM Foundation
@ -95,11 +95,9 @@ bool Foam::EddyDiffusivity<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2014-2015 OpenFOAM Foundation
@ -92,11 +92,9 @@ bool buoyantKEpsilon<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>
@ -123,11 +121,9 @@ buoyantKEpsilon<BasicTurbulenceModel>::kSource() const
{
return -fvm::SuSp(Gcoef(), this->k_);
}
else
{
return kEpsilon<BasicTurbulenceModel>::kSource();
}
}
template<class BasicTurbulenceModel>
@ -150,11 +146,9 @@ buoyantKEpsilon<BasicTurbulenceModel>::epsilonSource() const
return -fvm::SuSp(this->C1_*tanh(mag(v)/u)*Gcoef(), this->epsilon_);
}
else
{
return kEpsilon<BasicTurbulenceModel>::epsilonSource();
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -200,11 +200,9 @@ bool LamBremhorstKE::read()
return true;
}
else
{
return false;
}
}
void LamBremhorstKE::correct()

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -363,11 +363,9 @@ bool LienCubicKE::read()
return true;
}
else
{
return false;
}
}
void LienCubicKE::correct()

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -249,11 +249,9 @@ bool LienLeschziner::read()
return true;
}
else
{
return false;
}
}
void LienLeschziner::correct()

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -248,11 +248,9 @@ bool ShihQuadraticKE::read()
return true;
}
else
{
return false;
}
}
void ShihQuadraticKE::correct()

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -588,11 +588,9 @@ bool kkLOmega::read()
return true;
}
else
{
return false;
}
}
void kkLOmega::validate()

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -231,11 +231,9 @@ bool qZeta::read()
return true;
}
else
{
return false;
}
}
void qZeta::correct()

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -115,11 +115,9 @@ bool NicenoKEqn<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -92,11 +92,9 @@ bool SmagorinskyZhang<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -92,11 +92,9 @@ bool continuousGasKEqn<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation
@ -126,11 +126,9 @@ bool LaheyKEpsilon<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation
@ -107,11 +107,9 @@ bool continuousGasKEpsilon<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2014-2017 OpenFOAM Foundation
@ -93,11 +93,10 @@ bool kOmegaSSTSato<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>
const PhaseCompressibleTurbulenceModel

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2017, 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation
@ -473,11 +473,9 @@ bool kOmegaSSTBase<BasicEddyViscosityModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicEddyViscosityModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -166,11 +166,9 @@ bool SpalartAllmarasDDES<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -438,11 +438,9 @@ bool SpalartAllmarasDES<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation
@ -245,11 +245,9 @@ bool SpalartAllmarasIDDES<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation
@ -168,11 +168,9 @@ bool kOmegaSSTDDES<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation
@ -169,11 +169,9 @@ bool kOmegaSSTDES<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation
@ -244,11 +244,9 @@ bool kOmegaSSTIDDES<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -134,11 +134,9 @@ bool DeardorffDiffStress<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation
@ -192,11 +192,9 @@ bool Foam::LESModel<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation
@ -52,13 +52,11 @@ inline bool Foam::LESModels::smoothDelta::deltaData::update
// Something changed. Let caller know.
return true;
}
else
{
// Neighbour is not too big for me or change is too small
// Nothing changed.
return false;
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation
@ -85,11 +85,9 @@ bool LESeddyViscosity<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -133,11 +133,9 @@ bool Smagorinsky<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015-2017 OpenFOAM Foundation
@ -164,11 +164,9 @@ bool WALE<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -213,11 +213,9 @@ bool dynamicKEqn<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -145,11 +145,9 @@ bool dynamicLagrangian<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -133,11 +133,9 @@ bool kEqn<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -235,11 +235,9 @@ bool LRR<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -229,11 +229,9 @@ bool LaunderSharmaKE<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2017 OpenFOAM Foundation
@ -182,11 +182,9 @@ bool Foam::RASModel<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -232,11 +232,9 @@ bool RNGkEpsilon<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd
\\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015-2016 OpenFOAM Foundation
@ -245,11 +245,9 @@ bool SSG<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -284,11 +284,9 @@ bool SpalartAllmaras<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -212,11 +212,9 @@ bool kEpsilon<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -172,11 +172,9 @@ bool kOmega<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2016-2017 OpenFOAM Foundation
@ -511,11 +511,9 @@ bool kOmegaSSTLM<BasicTurbulenceModel>::read()
return true;
}
else
{
return false;
}
}
template<class BasicTurbulenceModel>

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