STYLE: reduced nesting on return branching

60234ab0 · Mark Olesen · Andrew Heather · 4bc3b2b9 · 60234ab0 · 60234ab0
Commit 60234ab0 authored Feb 13, 2019 by Mark Olesen Committed by Andrew Heather Feb 13, 2019
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -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,10 +96,8 @@ bool PDRkEpsilon::read()
        C4_.readIfPresent(coeffDict_);
        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
@@ -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,10 +141,8 @@ bool Foam::surfaceTensionModels::liquidProperties::writeData
    {
        return os.good();
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
@@ -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,10 +382,8 @@ bool Foam::twoPhaseMixtureThermo::read()
    {
        return interfaceProperties::read();
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
+++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
@@ -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,15 +143,9 @@ bool Foam::incompressibleTwoPhaseInteractingMixture::read()

            return true;
        }
-        else
-        {
-            return false;
-        }
-    }
-    else
-    {
-        return false;
    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
@@ -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,10 +541,8 @@ bool Foam::radiation::laserDTRM::read()
    {
        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C
@@ -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,10 +99,8 @@ bool Foam::temperaturePhaseChangeTwoPhaseMixture::read()
    {
        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C
@@ -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,10 +130,8 @@ bool Foam::thermoIncompressibleTwoPhaseMixture::read()

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
@@ -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,15 +239,9 @@ bool Foam::incompressibleThreePhaseMixture::read()

            return true;
        }
-        else
-        {
-            return false;
-        }
-    }
-    else
-    {
-        return false;
    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
@@ -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,10 +116,8 @@ bool Foam::phaseChangeTwoPhaseMixtures::Kunz::read()

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
@@ -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,10 +111,8 @@ bool Foam::phaseChangeTwoPhaseMixtures::Merkle::read()

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
@@ -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,10 +162,8 @@ bool Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::read()

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
@@ -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,10 +90,8 @@ bool Foam::phase::read(const dictionary& phaseDict)

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -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,10 +211,8 @@ bool Foam::RASModels::kineticTheoryModel::read()

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -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,10 +211,8 @@ bool Foam::RASModels::kineticTheoryModel::read()

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -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,10 +93,8 @@ bool limitRefinementLevel

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
+++ b/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
@@ -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,14 +417,12 @@ bool limitRefinementLevel
        }
        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;
 }



--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -359,10 +359,8 @@ bool splitCell

        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
@@ -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,14 +149,10 @@ bool Foam::conformalVoronoiMesh::regionIsInside
    {
        return meshableRegionA;
    }
-    else
-    {
-        WarningInFunction
-            << ""
-            << endl;

-        return false;
-    }
+    WarningInFunction << endl;
+
+    return false;
 }



--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
@@ -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,10 +89,8 @@ inline bool Foam::CV2D::insertMirrorPoint
        insertPoint(mirrorPoint, Vb::MIRROR_POINT);
        return true;
    }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }



--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertexI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertexI.H
@@ -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_);
 }