ENH: combine some phaseSystem selectors into regular .C files

- reduces the number of files, eases code refactoring

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files

@@ -4,14 +4,12 @@ multiphaseSystem/multiphaseSystem.C
 
 diameter = diameterModels
 $(diameter)/diameterModel/diameterModel.C
-$(diameter)/diameterModel/diameterModelNew.C
 $(diameter)/constantDiameter/constantDiameter.C
 $(diameter)/isothermalDiameter/isothermalDiameter.C
 
 
 drag = interfacialModels/dragModels
 $(drag)/dragModel/dragModel.C
-$(drag)/dragModel/dragModelNew.C
 $(drag)/Ergun/Ergun.C
 $(drag)/GidaspowErgunWenYu/GidaspowErgunWenYu.C
 $(drag)/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -24,7 +22,6 @@ $(drag)/interface/interface.C
 
 heatTransfer = interfacialModels/heatTransferModels
 $(heatTransfer)/heatTransferModel/heatTransferModel.C
-$(heatTransfer)/heatTransferModel/heatTransferModelNew.C
 $(heatTransfer)/RanzMarshall/RanzMarshall.C
 
 

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C

@@ -59,12 +59,6 @@ Foam::diameterModels::constant::constant
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::diameterModels::constant::~constant()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField> Foam::diameterModels::constant::d() const

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +55,7 @@ class constant
 :
     public diameterModel
 {
-    // Private data
+    // Private Data
 
         //- The constant diameter of the phase
         dimensionedScalar d_;
@@ -77,7 +78,7 @@ public:
 
 
     //- Destructor
-    virtual ~constant();
+    virtual ~constant() = default;
 
 
     // Member Functions

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,10 +50,40 @@ Foam::diameterModel::diameterModel
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::diameterModel::~diameterModel()
-{}
+Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
+(
+    const dictionary& dict,
+    const phaseModel& phase
+)
+{
+    const word modelType(dict.get<word>("diameterModel"));
+
+    Info<< "Selecting diameterModel for phase "
+        << phase.name()
+        << ": "
+        << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "diameterModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << exit(FatalIOError);
+    }
+
+    return cstrIter()
+    (
+        dict.optionalSubDict(modelType + "Coeffs"),
+        phase
+    );
+}
 
 
 // ************************************************************************* //

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +32,6 @@ Description
 
 SourceFiles
     diameterModel.C
-    newDiameterModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -55,9 +55,10 @@ class diameterModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         const dictionary& dict_;
+
         const phaseModel& phase_;
 
 
@@ -92,7 +93,7 @@ public:
 
 
     //- Destructor
-    virtual ~diameterModel();
+    virtual ~diameterModel() = default;
 
 
     // Selectors

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModelNew.C

@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "diameterModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
-(
-    const dictionary& dict,
-    const phaseModel& phase
-)
-{
-    const word modelType(dict.get<word>("diameterModel"));
-
-    Info << "Selecting diameterModel for phase "
-        << phase.name()
-        << ": "
-        << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "diameterModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
-    }
-
-    return cstrIter()
-    (
-        dict.optionalSubDict(modelType + "Coeffs"),
-        phase
-    );
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C

@@ -60,12 +60,6 @@ Foam::diameterModels::isothermal::isothermal
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::diameterModels::isothermal::~isothermal()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField> Foam::diameterModels::isothermal::d() const

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +55,7 @@ class isothermal
 :
     public diameterModel
 {
-    // Private data
+    // Private Data
 
         //- Reference diameter for the isothermal expansion
         dimensionedScalar d0_;
@@ -80,7 +81,7 @@ public:
 
 
     //- Destructor
-    virtual ~isothermal();
+    virtual ~isothermal() = default;
 
 
     // Member Functions

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,12 +62,6 @@ Foam::dragModels::blended::blended
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::dragModels::blended::~blended()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField> Foam::dragModels::blended::K

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,7 +81,7 @@ public:
 
 
     //- Destructor
-    virtual ~blended();
+    virtual ~blended() = default;
 
 
     // Member Functions

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,23 +41,50 @@ namespace Foam
 
 Foam::dragModel::dragModel
 (
-    const dictionary& interfaceDict,
+    const dictionary& dict,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    interfaceDict_(interfaceDict),
+    interfaceDict_(dict),
     phase1_(phase1),
     phase2_(phase2),
-    residualPhaseFraction_("residualPhaseFraction", dimless, interfaceDict),
-    residualSlip_("residualSlip", dimVelocity, interfaceDict)
+    residualPhaseFraction_("residualPhaseFraction", dimless, dict),
+    residualSlip_("residualSlip", dimVelocity, dict)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::dragModel::~dragModel()
-{}
+Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
+(
+    const dictionary& dict,
+    const phaseModel& phase1,
+    const phaseModel& phase2
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting dragModel for phase "
+        << phase1.name()
+        << ": "
+        << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "dragModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << exit(FatalIOError);
+    }
+
+    return cstrIter()(dict, phase1, phase2);
+}
 
 
 // ************************************************************************* //

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H

@@ -30,7 +30,6 @@ Description
 
 SourceFiles
     dragModel.C
-    newDragModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -54,7 +53,7 @@ class dragModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         const dictionary& interfaceDict_;
         const phaseModel& phase1_;
@@ -88,21 +87,21 @@ public:
 
         dragModel
         (
-            const dictionary& interfaceDict,
+            const dictionary& dict,
             const phaseModel& phase1,
             const phaseModel& phase2
         );
 
 
     //- Destructor
-    virtual ~dragModel();
+    virtual ~dragModel() = default;
 
 
     // Selectors
 
         static autoPtr<dragModel> New
         (
-            const dictionary& interfaceDict,
+            const dictionary& dict,
             const phaseModel& phase1,
             const phaseModel& phase2
         );

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModelNew.C

@@ -1,64 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "dragModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
-(
-    const dictionary& interfaceDict,
-    const phaseModel& phase1,
-    const phaseModel& phase2
-)
-{
-    const word modelType(interfaceDict.get<word>("type"));
-
-    Info << "Selecting dragModel for phase "
-        << phase1.name()
-        << ": "
-        << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            interfaceDict,
-            "dragModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
-    }
-
-    return cstrIter()(interfaceDict, phase1, phase2);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,12 +60,6 @@ Foam::dragModels::interface::interface
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::dragModels::interface::~interface()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField> Foam::dragModels::interface::K

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.H

@@ -73,7 +73,7 @@ public:
 
 
     //- Destructor
-    virtual ~interface();
+    virtual ~interface() = default;
 
 
     // Member Functions

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2012 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,23 +41,54 @@ namespace Foam
 
 Foam::heatTransferModel::heatTransferModel
 (
-    const dictionary& interfaceDict,
+    const dictionary& dict,
     const volScalarField& alpha1,
     const phaseModel& phase1,
     const phaseModel& phase2
 )
 :
-    interfaceDict_(interfaceDict),
+    interfaceDict_(dict),
     alpha1_(alpha1),
     phase1_(phase1),
     phase2_(phase2)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::heatTransferModel::~heatTransferModel()
-{}
+Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
+(
+    const dictionary& dict,
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
+)
+{
+    const word modelType
+    (
+        dict.get<word>("heatTransferModel" + phase1.name())
+    );
+
+    Info<< "Selecting heatTransferModel for phase "
+        << phase1.name()
+        << ": "
+        << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "heatTransferModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << exit(FatalIOError);
+    }
+
+    return cstrIter()(dict, alpha1, phase1, phase2);
+}
 
 
 // ************************************************************************* //

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +55,7 @@ class heatTransferModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         const dictionary& interfaceDict_;
         const volScalarField& alpha1_;
@@ -76,12 +77,12 @@ public:
             heatTransferModel,
             dictionary,
             (
-                const dictionary& interfaceDict,
+                const dictionary& dict,
                 const volScalarField& alpha1,
                 const phaseModel& phase1,
                 const phaseModel& phase2
             ),
-            (interfaceDict, alpha1, phase1, phase2)
+            (dict, alpha1, phase1, phase2)
         );
 
 
@@ -89,7 +90,7 @@ public:
 
         heatTransferModel
         (
-            const dictionary& interfaceDict,
+            const dictionary& dict,
             const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2
@@ -97,14 +98,14 @@ public:
 
 
     //- Destructor
-    virtual ~heatTransferModel();
+    virtual ~heatTransferModel() = default;
 
 
     // Selectors
 
         static autoPtr<heatTransferModel> New
         (
-            const dictionary& interfaceDict,
+            const dictionary& dict,
             const volScalarField& alpha1,
             const phaseModel& phase1,
             const phaseModel& phase2

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C

@@ -1,68 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "heatTransferModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
-(
-    const dictionary& interfaceDict,
-    const volScalarField& alpha1,
-    const phaseModel& phase1,
-    const phaseModel& phase2
-)
-{
-    const word modelType
-    (
-        interfaceDict.get<word>("heatTransferModel" + phase1.name())
-    );
-
-    Info<< "Selecting heatTransferModel for phase "
-        << phase1.name()
-        << ": "
-        << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            interfaceDict,
-            "heatTransferModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
-    }
-
-    return cstrIter()(interfaceDict, alpha1, phase1, phase2);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H

@@ -45,6 +45,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phaseModel;
 class phasePair;
 template <class ThermoType> class pureMixture;

src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files

@@ -1,5 +1,4 @@
 phaseModel/phaseModel/phaseModel.C
-phaseModel/phaseModel/phaseModelNew.C
 phaseModel/phaseModel/phaseModels.C
 
 phasePair/phasePair.C
@@ -13,19 +12,16 @@ multiphaseSystem/multiphaseSystemNew.C
 multiphaseSystem/multiphaseSystems.C
 
 interfaceCompositionModel/interfaceCompositionModel.C
-interfaceCompositionModel/interfaceCompositionModelNew.C
 InterfaceCompositionModel/InterfaceCompositionModels.C
 
 porous = interfaceModels/porousModels
 $(porous)/porousModel/porousModel.C
-$(porous)/porousModel/porousModelNew.C
 $(porous)/VollerPrakash/VollerPrakash.C
 
 /* Ununsed? */
 /*
 surfaceTension = interfaceModels/surfaceTensionModels
 $(surfaceTension)/surfaceTensionModel/surfaceTensionModel.C
-$(surfaceTension)/surfaceTensionModel/surfaceTensionModelNew.C
 $(surfaceTension)/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
 */
 

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C

@@ -39,7 +39,7 @@ namespace Foam
 
 
 const Foam::Enum<Foam::interfaceCompositionModel::modelVariable>
-Foam::interfaceCompositionModel::modelVariableNames
+Foam::interfaceCompositionModel::modelVariableNames_
 {
     { modelVariable::T, "temperature" },
     { modelVariable::P, "pressure" },
@@ -58,7 +58,7 @@ Foam::interfaceCompositionModel::interfaceCompositionModel
 :
     modelVariable_
     (
-        modelVariableNames.getOrDefault
+        modelVariableNames_.getOrDefault
         (
             "variable",
             dict,
@@ -72,6 +72,45 @@ Foam::interfaceCompositionModel::interfaceCompositionModel
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::interfaceCompositionModel>
+Foam::interfaceCompositionModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    const word modelType
+    (
+        dict.get<word>("type")
+      + "<"
+      + pair.phase1().thermo().type()
+      + ","
+      + pair.phase2().thermo().type()
+      + ">"
+    );
+
+    Info<< "Selecting interfaceCompositionModel for "
+        << pair << ": " << modelType << endl;
+
+    const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "interfaceCompositionModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << exit(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::word Foam::interfaceCompositionModel::transferSpecie() const
@@ -86,9 +125,9 @@ const Foam::phasePair& Foam::interfaceCompositionModel::pair() const
 }
 
 
-const Foam::word Foam::interfaceCompositionModel::variable() const
+const Foam::word& Foam::interfaceCompositionModel::variable() const
 {
-    return modelVariableNames[modelVariable_];
+    return modelVariableNames_[modelVariable_];
 }
 
 
@@ -103,4 +142,5 @@ bool Foam::interfaceCompositionModel::includeVolChange()
     return includeVolChange_;
 }
 
+
 // ************************************************************************* //

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H

@@ -41,8 +41,8 @@ SourceFiles
 
 #include "volFields.H"
 #include "dictionary.H"
-#include "runTimeSelectionTables.H"
 #include "Enum.H"
+#include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,7 +61,7 @@ class interfaceCompositionModel
 {
 public:
 
-    // Public type
+    // Public Types
 
         //- Enumeration for variable based mass transfer models
         enum modelVariable
@@ -72,19 +72,19 @@ public:
             alpha /* alpha source */
         };
 
-        static const Enum<modelVariable> modelVariableNames;
+protected:
 
-        //- Enumeration for model variables
+    // Protected Data
+
+        //- Selection names for the modelVariable
+        static const Enum<modelVariable> modelVariableNames_;
+
+        //- Enumeration for the model variable
         modelVariable modelVariable_;
 
         //- Add volume change in pEq
         bool includeVolChange_;
 
-
-protected:
-
-    // Protected Data
-
         //- Phase pair
         const phasePair& pair_;
 
@@ -141,11 +141,10 @@ public:
 
     // Member Functions
 
-
         //- Return the transferring species name
         const word transferSpecie() const;
 
-        //- Return pair
+        //- The phase pair
         const phasePair& pair() const;
 
         //- Interface mass fraction
@@ -206,7 +205,7 @@ public:
         bool includeVolChange();
 
         //- Returns the variable on which the model is based
-        const word variable() const;
+        const word& variable() const;
 };
 
 

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModelNew.C

@@ -1,72 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "interfaceCompositionModel.H"
-#include "phasePair.H"
-#include "rhoThermo.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::interfaceCompositionModel>
-Foam::interfaceCompositionModel::New
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-{
-    const word modelType
-    (
-        dict.get<word>("type")
-      + "<"
-      + pair.phase1().thermo().type()
-      + ","
-      + pair.phase2().thermo().type()
-      + ">"
-    );
-
-    Info<< "Selecting interfaceCompositionModel for "
-        << pair << ": " << modelType << endl;
-
-    const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "interfaceCompositionModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
-    }
-
-    return cstrIter()(dict, pair);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,6 +60,37 @@ Foam::porousModel::porousModel
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::porousModel>
+Foam::porousModel::New
+(
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting porousModel for "
+        <<  ": " << modelType << endl;
+
+    const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "porousModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << exit(FatalIOError);
+    }
+
+    return cstrIter()(dict, mesh);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::porousModel::writeData(Ostream& os) const

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -57,7 +58,7 @@ class porousModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Reference to mesh
         const fvMesh& mesh_;
@@ -85,7 +86,7 @@ public:
 
     // Constructors
 
-        //- Construct from a dictionary and a phase pair
+        //- Construct from a dictionary and mesh
         porousModel
         (
             const dictionary& dict,
@@ -108,7 +109,7 @@ public:
 
     // Member Functions
 
-        //- Momemtum source
+        //- Momentum source
         virtual  tmp<volScalarField> S() const = 0;
 
         //- Dummy write for regIOobject

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C

@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "porousModel.H"
-#include "phasePair.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::porousModel> Foam::porousModel::New
-(
-    const dictionary& dict,
-    const fvMesh& mesh
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting porousModel for "
-        <<  ": " << modelType << endl;
-
-    const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "porousModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
-    }
-
-    return cstrIter()(dict, mesh);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,6 +62,37 @@ Foam::surfaceTensionModel::surfaceTensionModel
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::surfaceTensionModel>
+Foam::surfaceTensionModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting surfaceTensionModel for "
+        << pair << ": " << modelType << endl;
+
+    const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "surfaceTensionModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << exit(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair, true);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::surfaceTensionModel::writeData(Ostream& os) const

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +30,6 @@ Description
 
 SourceFiles
     surfaceTensionModel.C
-    surfaceTensionModelNew.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,6 +45,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 
 /*---------------------------------------------------------------------------*\
@@ -58,7 +58,7 @@ class surfaceTensionModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -111,7 +111,7 @@ public:
 
     // Member Functions
 
-        //- Aspect ratio
+        //- Surface tension
         virtual tmp<volScalarField> sigma() const = 0;
 
         //- Dummy write for regIOobject

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C

@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "surfaceTensionModel.H"
-#include "phasePair.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::surfaceTensionModel> Foam::surfaceTensionModel::New
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting surfaceTensionModel for "
-        << pair << ": " << modelType << endl;
-
-    const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "surfaceTensionModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << exit(FatalIOError);
-    }
-
-    return cstrIter()(dict, pair, true);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModel.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,14 +62,41 @@ Foam::phaseModel::phaseModel
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-const Foam::word& Foam::phaseModel::name() const
+Foam::autoPtr<Foam::phaseModel>
+Foam::phaseModel::New
+(
+    const phaseSystem& fluid,
+    const word& phaseName
+)
 {
-    return name_;
+    const dictionary& dict = fluid.subDict(phaseName);
+
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting phaseModel for "
+        << phaseName << ": " << modelType << endl;
+
+    const auto cstrIter = phaseSystemConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "phaseModel",
+            modelType,
+            *phaseSystemConstructorTablePtr_
+        ) << exit(FatalIOError);
+    }
+
+    return cstrIter()(fluid, phaseName);
 }
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
 const Foam::phaseSystem& Foam::phaseModel::fluid() const
 {
     return fluid_;

src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,10 +28,8 @@ Class
 
 Description
 
-
 SourceFiles
     phaseModel.C
-    newphaseModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -51,6 +49,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phaseSystem;
 
 /*---------------------------------------------------------------------------*\
@@ -110,8 +109,11 @@ public:
 
     // Member Functions
 
-        //- Return the name of this phase
-        const word& name() const;
+        //- The name of this phase
+        const word& name() const
+        {
+            return name_;
+        }
 
         //- Return the system to which this phase belongs
         const phaseSystem& fluid() const;

src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModelNew.C

@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "phaseModel.H"
-#include "phaseSystem.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
-(
-    const phaseSystem& fluid,
-    const word& phaseName
-)
-{
-    const dictionary& dict = fluid.subDict(phaseName);
-
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting phaseModel for "
-        << phaseName << ": " << modelType << endl;
-
-    const auto cstrIter = phaseSystemConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "phaseModel",
-            modelType,
-            *phaseSystemConstructorTablePtr_
-        ) << exit(FatalIOError);
-    }
-
-    return cstrIter()(fluid, phaseName);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2018 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,10 +46,36 @@ Foam::blendingMethod::blendingMethod
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::blendingMethod::~blendingMethod()
-{}
+Foam::autoPtr<Foam::blendingMethod>
+Foam::blendingMethod::New
+(
+    const word& modelName,
+    const dictionary& dict,
+    const wordList& phaseNames
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting " << modelName << " blending method: "
+        << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "blendingMethod",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, phaseNames);
+}
 
 
 // ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -74,7 +75,7 @@ public:
     // Constructors
 
         //- Construct from a dictionary
-        blendingMethod
+        explicit blendingMethod
         (
             const dictionary& dict
         );
@@ -91,7 +92,7 @@ public:
 
 
     //- Destructor
-    virtual ~blendingMethod();
+    virtual ~blendingMethod() = default;
 
 
     // Member Functions

src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C

@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2014-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "blendingMethod.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::blendingMethod> Foam::blendingMethod::New
-(
-    const word& modelName,
-    const dictionary& dict,
-    const wordList& phaseNames
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting " << modelName << " blending method: "
-        << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "blendingMethod",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict, phaseNames);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files

@@ -1,5 +1,4 @@
 phaseModel/phaseModel/phaseModel.C
-phaseModel/phaseModel/phaseModelNew.C
 phaseModel/phaseModel/phaseModels.C
 
 phasePair/phasePairKey.C
@@ -16,7 +15,6 @@ reactionThermo/hRefConstThermos.C
 
 diameter = diameterModels
 $(diameter)/diameterModel/diameterModel.C
-$(diameter)/diameterModel/diameterModelNew.C
 $(diameter)/constantDiameter/constantDiameter.C
 $(diameter)/isothermalDiameter/isothermalDiameter.C
 $(diameter)/linearTsubDiameter/linearTsubDiameter.C
@@ -65,7 +63,6 @@ $(nucleation)/wallBoiling/wallBoiling.C
 
 blending = BlendedInterfacialModel/blendingMethods
 $(blending)/blendingMethod/blendingMethod.C
-$(blending)/blendingMethod/blendingMethodNew.C
 $(blending)/noBlending/noBlending.C
 $(blending)/linear/linear.C
 $(blending)/hyperbolic/hyperbolic.C
@@ -75,7 +72,6 @@ interfacialModels/wallDependentModel/wallDependentModel.C
 
 aspectRatio = interfacialModels/aspectRatioModels
 $(aspectRatio)/aspectRatioModel/aspectRatioModel.C
-$(aspectRatio)/aspectRatioModel/aspectRatioModelNew.C
 $(aspectRatio)/constantAspectRatio/constantAspectRatio.C
 $(aspectRatio)/TomiyamaAspectRatio/TomiyamaAspectRatio.C
 $(aspectRatio)/VakhrushevEfremov/VakhrushevEfremov.C
@@ -83,7 +79,6 @@ $(aspectRatio)/Wellek/Wellek.C
 
 drag = interfacialModels/dragModels
 $(drag)/dragModel/dragModel.C
-$(drag)/dragModel/dragModelNew.C
 $(drag)/Beetstra/Beetstra.C
 $(drag)/segregated/segregated.C
 $(drag)/Ergun/Ergun.C
@@ -103,7 +98,6 @@ $(drag)/AttouFerschneider/AttouFerschneider.C
 
 lift = interfacialModels/liftModels
 $(lift)/liftModel/liftModel.C
-$(lift)/liftModel/liftModelNew.C
 $(lift)/noLift/noLift.C
 $(lift)/constantLiftCoefficient/constantLiftCoefficient.C
 $(lift)/Moraga/Moraga.C
@@ -113,25 +107,21 @@ $(lift)/wallDampedLift/wallDampedLift.C
 
 heatTransfer = interfacialModels/heatTransferModels
 $(heatTransfer)/heatTransferModel/heatTransferModel.C
-$(heatTransfer)/heatTransferModel/heatTransferModelNew.C
 $(heatTransfer)/constantNu/constantNuHeatTransfer.C
 $(heatTransfer)/RanzMarshall/RanzMarshall.C
 $(heatTransfer)/sphericalHeatTransfer/sphericalHeatTransfer.C
 
 phaseTransfer = interfacialModels/phaseTransferModels
 $(phaseTransfer)/phaseTransferModel/phaseTransferModel.C
-$(phaseTransfer)/phaseTransferModel/phaseTransferModelNew.C
 $(phaseTransfer)/deposition/deposition.C
 
 swarm = interfacialModels/swarmCorrections
 $(swarm)/swarmCorrection/swarmCorrection.C
-$(swarm)/swarmCorrection/swarmCorrectionNew.C
 $(swarm)/noSwarm/noSwarm.C
 $(swarm)/TomiyamaSwarm/TomiyamaSwarm.C
 
 dispersion = interfacialModels/turbulentDispersionModels
 $(dispersion)/turbulentDispersionModel/turbulentDispersionModel.C
-$(dispersion)/turbulentDispersionModel/turbulentDispersionModelNew.C
 $(dispersion)/noTurbulentDispersion/noTurbulentDispersion.C
 $(dispersion)/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
 $(dispersion)/Burns/Burns.C
@@ -140,14 +130,12 @@ $(dispersion)/LopezDeBertodano/LopezDeBertodano.C
 
 virtualMass = interfacialModels/virtualMassModels
 $(virtualMass)/virtualMassModel/virtualMassModel.C
-$(virtualMass)/virtualMassModel/virtualMassModelNew.C
 $(virtualMass)/noVirtualMass/noVirtualMass.C
 $(virtualMass)/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
 $(virtualMass)/Lamb/Lamb.C
 
 damping = interfacialModels/wallDampingModels
 $(damping)/wallDampingModel/wallDampingModel.C
-$(damping)/wallDampingModel/wallDampingModelNew.C
 $(damping)/noWallDamping/noWallDamping.C
 $(damping)/interpolated/interpolatedWallDamping.C
 $(damping)/linear/linearWallDamping.C
@@ -156,7 +144,6 @@ $(damping)/sine/sineWallDamping.C
 
 lubrication = interfacialModels/wallLubricationModels
 $(lubrication)/wallLubricationModel/wallLubricationModel.C
-$(lubrication)/wallLubricationModel/wallLubricationModelNew.C
 $(lubrication)/noWallLubrication/noWallLubrication.C
 $(lubrication)/Antal/Antal.C
 $(lubrication)/Frank/Frank.C
@@ -164,18 +151,15 @@ $(lubrication)/TomiyamaWallLubrication/TomiyamaWallLubrication.C
 
 composition = interfacialCompositionModels/interfaceCompositionModels
 $(composition)/interfaceCompositionModel/interfaceCompositionModel.C
-$(composition)/interfaceCompositionModel/interfaceCompositionModelNew.C
 $(composition)/InterfaceCompositionModel/InterfaceCompositionModels.C
 
 massTransfer = interfacialCompositionModels/massTransferModels
 $(massTransfer)/massTransferModel/massTransferModel.C
-$(massTransfer)/massTransferModel/massTransferModelNew.C
 $(massTransfer)/Frossling/Frossling.C
 $(massTransfer)/sphericalMassTransfer/sphericalMassTransfer.C
 
 saturation = interfacialCompositionModels/saturationModels
 $(saturation)/saturationModel/saturationModel.C
-$(saturation)/saturationModel/saturationModelNew.C
 $(saturation)/Antoine/Antoine.C
 $(saturation)/AntoineExtended/AntoineExtended.C
 $(saturation)/ArdenBuck/ArdenBuck.C
@@ -185,7 +169,6 @@ $(saturation)/constantSaturationConditions/constantSaturationConditions.C
 
 surfaceTension = interfacialCompositionModels/surfaceTensionModels
 $(surfaceTension)/surfaceTensionModel/surfaceTensionModel.C
-$(surfaceTension)/surfaceTensionModel/surfaceTensionModelNew.C
 $(surfaceTension)/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
 
 
@@ -204,7 +187,6 @@ wallBoilingSubModels = derivedFvPatchFields/wallBoilingSubModels
 
 partitioning = $(wallBoilingSubModels)/partitioningModels
 $(partitioning)/partitioningModel/partitioningModel.C
-$(partitioning)/partitioningModel/partitioningModelNew.C
 $(partitioning)/phaseFraction/phaseFraction.C
 $(partitioning)/Lavieville/Lavieville.C
 $(partitioning)/cosine/cosine.C
@@ -212,48 +194,39 @@ $(partitioning)/linear/linear.C
 
 nucleationSite = $(wallBoilingSubModels)/nucleationSiteModels
 $(nucleationSite)/nucleationSiteModel/nucleationSiteModel.C
-$(nucleationSite)/nucleationSiteModel/nucleationSiteModelNew.C
 $(nucleationSite)/LemmertChawla/LemmertChawla.C
 
 departureDiam = $(wallBoilingSubModels)/departureDiameterModels
 $(departureDiam)/departureDiameterModel/departureDiameterModel.C
-$(departureDiam)/departureDiameterModel/departureDiameterModelNew.C
 $(departureDiam)/TolubinskiKostanchuk/TolubinskiKostanchuk.C
 $(departureDiam)/KocamustafaogullariIshii/KocamustafaogullariIshii.C
 
 departureFreq = $(wallBoilingSubModels)/departureFrequencyModels
 $(departureFreq)/departureFrequencyModel/departureFrequencyModel.C
-$(departureFreq)/departureFrequencyModel/departureFrequencyModelNew.C
 $(departureFreq)/Cole/Cole.C
 
 CHFModels = $(wallBoilingSubModels)/CHFModels
 $(CHFModels)/CHFModel/CHFModel.C
-$(CHFModels)/CHFModel/CHFModelNew.C
 $(CHFModels)/Zuber/Zuber.C
 
 CHFSubCoolModels = $(wallBoilingSubModels)/CHFSubCoolModels
 $(CHFSubCoolModels)/CHFSubCoolModel/CHFSubCoolModel.C
-$(CHFSubCoolModels)/CHFSubCoolModel/CHFSubCoolModelNew.C
 $(CHFSubCoolModels)/HuaXu/HuaXu.C
 
 filmBoiling = $(wallBoilingSubModels)/filmBoilingModels
 $(filmBoiling)/filmBoilingModel/filmBoilingModel.C
-$(filmBoiling)/filmBoilingModel/filmBoilingModelNew.C
 $(filmBoiling)/Bromley/Bromley.C
 
 Leidenfrost = $(wallBoilingSubModels)/LeidenfrostModels
 $(Leidenfrost)/LeidenfrostModel/LeidenfrostModel.C
-$(Leidenfrost)/LeidenfrostModel/LeidenfrostModelNew.C
 $(Leidenfrost)/Spiegler/Spiegler.C
 
 MHFModels = $(wallBoilingSubModels)/MHFModels
 $(MHFModels)/MHFModel/MHFModel.C
-$(MHFModels)/MHFModel/MHFModelNew.C
 $(MHFModels)/Jeschar/Jeschar.C
 
 TDNBModels = $(wallBoilingSubModels)/TDNBModels
 $(TDNBModels)/TDNBModel/TDNBModel.C
-$(TDNBModels)/TDNBModel/TDNBModelNew.C
 $(TDNBModels)/Schroeder/Schroeder.C
 
 /* Turbulence */

src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C

@@ -30,7 +30,6 @@ License
 #include "interfaceCompositionModel.H"
 #include "massTransferModel.H"
 
-
 // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
 
 template<class BasePhaseSystem>
@@ -58,21 +57,12 @@ Foam::InterfaceCompositionPhaseChangePhaseSystem<BasePhaseSystem>::iDmdt
         {
             const scalar iDmdtSign = Pair<word>::compare(pair, key);
 
-            forAllConstIter
+            for
             (
-                hashedWordList,
-                interfaceCompositionModels_[pair]->species(),
-                memberIter
+                const word& member
+              : interfaceCompositionModels_[pair]->species()
             )
             {
-                const word& member = *memberIter;
-
-                const word name(IOobject::groupName(member, phase.name()));
-                const word otherName
-                (
-                    IOobject::groupName(member, otherPhase.name())
-                );
-
                 tIDmdt.ref() +=
                     iDmdtSign
                    *(
@@ -87,7 +77,6 @@ Foam::InterfaceCompositionPhaseChangePhaseSystem<BasePhaseSystem>::iDmdt
 }
 
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class BasePhaseSystem>
@@ -202,10 +191,8 @@ InterfaceCompositionPhaseChangePhaseSystem
         iDmdtSu_.set(pair, new HashPtrTable<volScalarField>());
         iDmdtSp_.set(pair, new HashPtrTable<volScalarField>());
 
-        forAllConstIter(hashedWordList, compositionModel.species(), memberIter)
+        for (const word& member : compositionModel.species())
         {
-            const word& member = *memberIter;
-
             iDmdtSu_[pair]->set
             (
                 member,
@@ -284,16 +271,8 @@ Foam::InterfaceCompositionPhaseChangePhaseSystem<BasePhaseSystem>::dmdts() const
         const phaseModel& phase = pair.phase1();
         const phaseModel& otherPhase = pair.phase2();
 
-        forAllConstIter(hashedWordList, compositionModel.species(), memberIter)
+        for (const word& member : compositionModel.species())
         {
-            const word& member = *memberIter;
-
-            const word name(IOobject::groupName(member, phase.name()));
-            const word otherName
-            (
-                IOobject::groupName(member, otherPhase.name())
-            );
-
             const volScalarField iDmdt
             (
                 *(*iDmdtSu_[pair])[member]
@@ -344,10 +323,12 @@ massTransfer() const
             massTransferModels_[unorderedPair][unorderedPair.index(phase)]->K()
         );
 
-        forAllConstIter(hashedWordList, compositionModel.species(), memberIter)
+        for
+        (
+            const word& member
+          : compositionModel.species()
+        )
         {
-            const word& member = *memberIter;
-
             const word name(IOobject::groupName(member, phase.name()));
             const word otherName
             (

src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H

@@ -49,6 +49,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class interfaceCompositionModel;
 class massTransferModel;
 
@@ -63,7 +64,7 @@ class InterfaceCompositionPhaseChangePhaseSystem
 {
 protected:
 
-    // Protected typedefs
+    // Protected Typedefs
 
         typedef HashTable
         <
@@ -84,14 +85,17 @@ protected:
             HashPtrTable<volScalarField>,
             phasePairKey,
             phasePairKey::hash
-        >
-        iDmdtSuSpTable;
+        > iDmdtSuSpTable;
 
-        typedef HashPtrTable<volScalarField, phasePairKey, phasePairKey::hash>
-            iDmdtTable;
+        typedef HashPtrTable
+        <
+            volScalarField,
+            phasePairKey,
+            phasePairKey::hash
+        > iDmdtTable;
 
 
-    // Protected data
+    // Protected Data
 
         // Sub Models
 
@@ -111,7 +115,7 @@ protected:
             mutable iDmdtSuSpTable iDmdtSp_;
 
 
-    // Protected member functions
+    // Protected Member Functions
 
         //- Return the interfacial mass transfer rate for a pair for a pair
         virtual tmp<volScalarField> iDmdt(const phasePairKey& key) const;
@@ -122,7 +126,7 @@ public:
     // Constructors
 
         //- Construct from fvMesh
-        InterfaceCompositionPhaseChangePhaseSystem(const fvMesh&);
+        explicit InterfaceCompositionPhaseChangePhaseSystem(const fvMesh&);
 
 
     //- Destructor

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C

@@ -39,16 +39,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::CHFModel::CHFModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::CHFModel>
+Foam::wallBoilingModels::CHFModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting CHFModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::CHFModel::~CHFModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "CHFModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd
+    Copyright (C) 2018-2020 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,6 @@ Description
 
 SourceFiles
     CHFModel.C
-    newCHFModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -57,15 +56,6 @@ namespace wallBoilingModels
 
 class CHFModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        CHFModel(const CHFModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const CHFModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,22 +75,21 @@ public:
     );
 
 
-    // Constructors
+    // Generated Methods
 
-        //- Construct null
-        CHFModel();
+        //- Default construct
+        CHFModel() = default;
+
+        //- Destructor
+        virtual ~CHFModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<CHFModel> New(const dictionary& dict);
 
 
-    //- Destructor
-    virtual ~CHFModel();
-
-
     // Member Functions
 
         //- Calculate temperature
@@ -119,6 +108,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModelNew.C

@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2015-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "CHFModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::CHFModel>
-Foam::wallBoilingModels::CHFModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting CHFModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "CHFModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C

@@ -39,16 +39,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::CHFSubCoolModel::CHFSubCoolModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::CHFSubCoolModel>
+Foam::wallBoilingModels::CHFSubCoolModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting CHFSubCoolModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::CHFSubCoolModel::~CHFSubCoolModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "CHFSubCoolModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd
+    Copyright (C) 2018-2020 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,6 @@ Description
 
 SourceFiles
     CHFSubCoolModel.C
-    newCHFSubCoolModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -57,15 +56,6 @@ namespace wallBoilingModels
 
 class CHFSubCoolModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        CHFSubCoolModel(const CHFSubCoolModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const CHFSubCoolModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,22 +75,21 @@ public:
     );
 
 
-    // Constructors
+    // Generated Methods
 
-        //- Construct null
-        CHFSubCoolModel();
+        //- Default construct
+        CHFSubCoolModel() = default;
+
+        //- Destructor
+        virtual ~CHFSubCoolModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<CHFSubCoolModel> New(const dictionary& dict);
 
 
-    //- Destructor
-    virtual ~CHFSubCoolModel();
-
-
     // Member Functions
 
         //- Calculate temperature
@@ -119,6 +108,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModelNew.C

@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "CHFSubCoolModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::CHFSubCoolModel>
-Foam::wallBoilingModels::CHFSubCoolModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting CHFSubCoolModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "CHFSubCoolModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C

@@ -39,16 +39,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::LeidenfrostModel::LeidenfrostModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::LeidenfrostModel>
+Foam::wallBoilingModels::LeidenfrostModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting LeidenfrostModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::LeidenfrostModel::~LeidenfrostModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "LeidenfrostModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd
+    Copyright (C) 2018-2020 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,6 @@ Description
 
 SourceFiles
     LeidenfrostModel.C
-    newLeidenfrostModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -57,15 +56,6 @@ namespace wallBoilingModels
 
 class LeidenfrostModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        LeidenfrostModel(const LeidenfrostModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const LeidenfrostModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,22 +75,21 @@ public:
     );
 
 
-    // Constructors
+    // Generated Methods
 
-        //- Construct null
-        LeidenfrostModel();
+        //- Default construct
+        LeidenfrostModel() = default;
+
+        //- Destructor
+        virtual ~LeidenfrostModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<LeidenfrostModel> New(const dictionary& dict);
 
 
-    //- Destructor
-    virtual ~LeidenfrostModel();
-
-
     // Member Functions
 
         //- Calculate temperature
@@ -119,6 +108,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModelNew.C

@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LeidenfrostModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::LeidenfrostModel>
-Foam::wallBoilingModels::LeidenfrostModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting LeidenfrostModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "LeidenfrostModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C

@@ -39,16 +39,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::MHFModel::MHFModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::MHFModel>
+Foam::wallBoilingModels::MHFModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting MHFModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::MHFModel::~MHFModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "MHFModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd
+    Copyright (C) 2018-2020 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,6 @@ Description
 
 SourceFiles
     MHFModel.C
-    newMHFModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -57,15 +56,6 @@ namespace wallBoilingModels
 
 class MHFModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        MHFModel(const MHFModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const MHFModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,22 +75,21 @@ public:
     );
 
 
-    // Constructors
+    // Generated Methods
 
-        //- Construct null
-        MHFModel();
+        //- Default construct
+        MHFModel() = default;
+
+        //- Destructor
+        virtual ~MHFModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<MHFModel> New(const dictionary& dict);
 
 
-    //- Destructor
-    virtual ~MHFModel();
-
-
     // Member Functions
 
         //- Calculate temperature
@@ -119,6 +108,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModelNew.C

@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "MHFModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::MHFModel>
-Foam::wallBoilingModels::MHFModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting MHFModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "MHFModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C

@@ -39,16 +39,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::TDNBModel::TDNBModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::TDNBModel>
+Foam::wallBoilingModels::TDNBModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting TDNBModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::TDNBModel::~TDNBModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "TDNBModelType",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd
+    Copyright (C) 2018-2020 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,6 @@ Description
 
 SourceFiles
     TDNBModel.C
-    newTDNBModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -57,15 +56,6 @@ namespace wallBoilingModels
 
 class TDNBModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        TDNBModel(const TDNBModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const TDNBModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,22 +75,21 @@ public:
     );
 
 
-    // Constructors
+    // Generated Methods
 
-        //- Construct null
-        TDNBModel();
+        //- Default construct
+        TDNBModel() = default;
+
+        //- Destructor
+        virtual ~TDNBModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<TDNBModel> New(const dictionary& dict);
 
 
-    //- Destructor
-    virtual ~TDNBModel();
-
-
     // Member Functions
 
         //- Calculate temperature
@@ -119,6 +108,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModelNew.C

@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "TDNBModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::TDNBModel>
-Foam::wallBoilingModels::TDNBModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting TDNBModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "TDNBModelType",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2019 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,16 +40,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::departureDiameterModel::departureDiameterModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::departureDiameterModel>
+Foam::wallBoilingModels::departureDiameterModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting departureDiameterModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::departureDiameterModel::~departureDiameterModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "departureDiameterModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +32,6 @@ Description
 
 SourceFiles
     departureDiameterModel.C
-    newdepartureDiameterModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -52,20 +52,11 @@ namespace wallBoilingModels
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class departureDiameterModel Declaration
+                   Class departureDiameterModel Declaration
 \*---------------------------------------------------------------------------*/
 
 class departureDiameterModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        departureDiameterModel(const departureDiameterModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const departureDiameterModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,22 +76,21 @@ public:
     );
 
 
-    // Constructors
+    // Generated Methods
 
-        //- Construct null
-        departureDiameterModel();
+        //- Default construct
+        departureDiameterModel() = default;
+
+        //- Destructor
+        virtual ~departureDiameterModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<departureDiameterModel> New(const dictionary& dict);
 
 
-    //- Destructor
-    virtual ~departureDiameterModel();
-
-
     // Member Functions
 
         //- Calculate and return the departure diameter field
@@ -119,6 +109,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C

@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "departureDiameterModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::departureDiameterModel>
-Foam::wallBoilingModels::departureDiameterModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting departureDiameterModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "departureDiameterModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2019 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,16 +40,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::departureFrequencyModel::departureFrequencyModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::departureFrequencyModel>
+Foam::wallBoilingModels::departureFrequencyModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting departureFrequencyModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::departureFrequencyModel::~departureFrequencyModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "departureFrequencyModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +32,6 @@ Description
 
 SourceFiles
     departureFrequencyModel.C
-    newdepartureFrequencyModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -52,20 +52,11 @@ namespace wallBoilingModels
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class departureFrequencyModel Declaration
+                   Class departureFrequencyModel Declaration
 \*---------------------------------------------------------------------------*/
 
 class departureFrequencyModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        departureFrequencyModel(const departureFrequencyModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const departureFrequencyModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,22 +76,21 @@ public:
     );
 
 
-    // Constructors
+    // Generated Methods
 
-        //- Construct null
-        departureFrequencyModel();
+        //- Default construct
+        departureFrequencyModel() = default;
+
+        //- Destructor
+        virtual ~departureFrequencyModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<departureFrequencyModel> New(const dictionary& dict);
 
 
-    //- Destructor
-    virtual ~departureFrequencyModel();
-
-
     // Member Functions
 
         //- Calculate and return the bubble departure frequency
@@ -117,6 +107,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C

@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "departureFrequencyModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::departureFrequencyModel>
-Foam::wallBoilingModels::departureFrequencyModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting departureFrequencyModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "departureFrequencyModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C

@@ -39,16 +39,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::filmBoilingModel::filmBoilingModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::filmBoilingModel>
+Foam::wallBoilingModels::filmBoilingModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting filmBoilingModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::filmBoilingModel::~filmBoilingModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "filmBoilingModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd
+    Copyright (C) 2018-2020 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,6 @@ Description
 
 SourceFiles
     filmBoilingModel.C
-    newfilmBoilingModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -57,15 +56,6 @@ namespace wallBoilingModels
 
 class filmBoilingModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        filmBoilingModel(const filmBoilingModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const filmBoilingModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,22 +75,21 @@ public:
     );
 
 
-    // Constructors
+    // Generated Methods
 
-        //- Construct null
-        filmBoilingModel();
+        //- Default construct
+        filmBoilingModel() = default;
+
+        //- Destructor
+        virtual ~filmBoilingModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<filmBoilingModel> New(const dictionary& dict);
 
 
-    //- Destructor
-    virtual ~filmBoilingModel();
-
-
     // Member Functions
 
         //- Calculate temperature
@@ -119,6 +108,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModelNew.C

@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "filmBoilingModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::filmBoilingModel>
-Foam::wallBoilingModels::filmBoilingModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting filmBoilingModel: "
-        << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "filmBoilingModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2019 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,16 +40,33 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::nucleationSiteModel::nucleationSiteModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::nucleationSiteModel>
+Foam::wallBoilingModels::nucleationSiteModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting nucleationSiteModel: " << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::nucleationSiteModel::~nucleationSiteModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "nucleationSiteModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H

@@ -31,7 +31,6 @@ Description
 
 SourceFiles
     nucleationSiteModel.C
-    newnucleationSiteModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -48,6 +47,7 @@ SourceFiles
 
 namespace Foam
 {
+
 namespace wallBoilingModels
 {
 
@@ -57,15 +57,6 @@ namespace wallBoilingModels
 
 class nucleationSiteModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        nucleationSiteModel(const nucleationSiteModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const nucleationSiteModel&);
-
-
 public:
 
     //- Runtime type information
@@ -87,18 +78,18 @@ public:
 
     // Constructors
 
-        //- Construct null
-        nucleationSiteModel();
+        //- Default construct
+        nucleationSiteModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<nucleationSiteModel> New(const dictionary& dict);
 
 
     //- Destructor
-    virtual ~nucleationSiteModel();
+    virtual ~nucleationSiteModel() = default;
 
 
     // Member Functions
@@ -119,6 +110,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C

@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "nucleationSiteModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::nucleationSiteModel>
-Foam::wallBoilingModels::nucleationSiteModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting nucleationSiteModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "nucleationSiteModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2019 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,16 +40,34 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::wallBoilingModels::partitioningModel::partitioningModel()
-{}
+Foam::autoPtr<Foam::wallBoilingModels::partitioningModel>
+Foam::wallBoilingModels::partitioningModel::New
+(
+    const dictionary& dict
+)
+{
+    const word modelType(dict.get<word>("type"));
 
+    Info<< "Selecting partitioningModel: "
+        << modelType << endl;
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-Foam::wallBoilingModels::partitioningModel::~partitioningModel()
-{}
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "partitioningModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +32,6 @@ Description
 
 SourceFiles
     partitioningModel.C
-    newpartitioningModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -55,15 +55,6 @@ namespace wallBoilingModels
 
 class partitioningModel
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        partitioningModel(const partitioningModel&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const partitioningModel&);
-
-
 public:
 
     //- Runtime type information
@@ -85,18 +76,18 @@ public:
 
     // Constructors
 
-        //- Construct null
-        partitioningModel();
+        //- Default construct
+        partitioningModel() = default;
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<partitioningModel> New(const dictionary& dict);
 
 
     //- Destructor
-    virtual ~partitioningModel();
+    virtual ~partitioningModel() = default;
 
 
     // Member Functions
@@ -112,6 +103,7 @@ public:
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 } // End namespace wallBoilingModels
 } // End namespace Foam
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C

@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2016-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "partitioningModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::wallBoilingModels::partitioningModel>
-Foam::wallBoilingModels::partitioningModel::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting partitioningModel: "
-        << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "partitioningModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H

@@ -54,7 +54,7 @@ class constant
 :
     public diameterModel
 {
-    // Private data
+    // Private Data
 
         //- The constant diameter of the phase
         dimensionedScalar d_;

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2019 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,19 +41,51 @@ namespace Foam
 
 Foam::diameterModel::diameterModel
 (
-    const dictionary& diameterProperties,
+    const dictionary& dict,
     const phaseModel& phase
 )
 :
-    diameterProperties_(diameterProperties),
+    diameterProperties_(dict),
     phase_(phase)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::diameterModel::~diameterModel()
-{}
+Foam::autoPtr<Foam::diameterModel>
+Foam::diameterModel::New
+(
+    const dictionary& dict,
+    const phaseModel& phase
+)
+{
+    const word modelType(dict.get<word>("diameterModel"));
+
+    Info<< "Selecting diameterModel for phase "
+        << phase.name()
+        << ": "
+        << modelType << endl;
+
+    auto cstrIter =
+        dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "diameterModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()
+    (
+        dict.optionalSubDict(modelType + "Coeffs"),
+        phase
+    );
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -61,9 +94,9 @@ void Foam::diameterModel::correct()
 {}
 
 
-bool Foam::diameterModel::read(const dictionary& phaseProperties)
+bool Foam::diameterModel::read(const dictionary& dict)
 {
-    diameterProperties_ = phaseProperties.optionalSubDict(type() + "Coeffs");
+    diameterProperties_ = dict.optionalSubDict(type() + "Coeffs");
 
     return true;
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2019 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,11 +28,10 @@ Class
     Foam::diameterModel
 
 Description
-    A2stract base-class for dispersed-phase particle diameter models.
+    Abstract base-class for dispersed-phase particle diameter models.
 
 SourceFiles
     diameterModel.C
-    newDiameterModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -53,12 +53,12 @@ namespace Foam
 
 class diameterModel
 {
-
 protected:
 
-    // Protected data
+    // Protected Data
 
         dictionary diameterProperties_;
+
         const phaseModel& phase_;
 
 
@@ -76,10 +76,10 @@ public:
             diameterModel,
             dictionary,
             (
-                const dictionary& diameterProperties,
+                const dictionary& dict,
                 const phaseModel& phase
             ),
-            (diameterProperties, phase)
+            (dict, phase)
         );
 
 
@@ -87,13 +87,13 @@ public:
 
         diameterModel
         (
-            const dictionary& diameterProperties,
+            const dictionary& dict,
             const phaseModel& phase
         );
 
 
     //- Destructor
-    virtual ~diameterModel();
+    virtual ~diameterModel() = default;
 
 
     // Selectors

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModelNew.C

@@ -1,68 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "diameterModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
-(
-    const dictionary& dict,
-    const phaseModel& phase
-)
-{
-    const word modelType(dict.get<word>("diameterModel"));
-
-    Info << "Selecting diameterModel for phase "
-        << phase.name()
-        << ": "
-        << modelType << endl;
-
-    auto cstrIter =
-        dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "diameterModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()
-    (
-        dict.optionalSubDict(modelType + "Coeffs"),
-        phase
-    );
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C

@@ -74,12 +74,6 @@ Foam::diameterModels::isothermal::isothermal
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::diameterModels::isothermal::~isothermal()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField> Foam::diameterModels::isothermal::d() const

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H

@@ -54,7 +54,7 @@ class isothermal
 :
     public diameterModel
 {
-    // Private data
+    // Private Data
 
         //- Reference diameter for the isothermal expansion
         dimensionedScalar d0_;
@@ -83,7 +83,7 @@ public:
 
 
     //- Destructor
-    virtual ~isothermal();
+    virtual ~isothermal() = default;
 
 
     // Member Functions

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H

@@ -45,6 +45,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phaseModel;
 class phasePair;
 template<class ThermoType> class pureMixture;

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C

@@ -51,14 +51,47 @@ Foam::interfaceCompositionModel::interfaceCompositionModel
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-const Foam::hashedWordList& Foam::interfaceCompositionModel::species() const
+Foam::autoPtr<Foam::interfaceCompositionModel>
+Foam::interfaceCompositionModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
 {
-    return speciesNames_;
+    const word modelType
+    (
+        dict.get<word>("type")
+      + "<"
+      + pair.phase1().thermo().type()
+      + ","
+      + pair.phase2().thermo().type()
+      + ">"
+    );
+
+    Info<< "Selecting interfaceCompositionModel for "
+        << pair << ": " << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "interfaceCompositionModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair);
 }
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
 bool Foam::interfaceCompositionModel::transports(word& speciesName) const
 {
     return this->speciesNames_.found(speciesName);

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,6 +50,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phaseModel;
 class phasePair;
 
@@ -60,7 +62,7 @@ class interfaceCompositionModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -118,8 +120,11 @@ public:
         //- Update the composition
         virtual void update(const volScalarField& Tf) = 0;
 
-        //- Return the transferring species names
-        const hashedWordList& species() const;
+        //- The transferring species names
+        const hashedWordList& species() const
+        {
+            return speciesNames_;
+        }
 
         //- Returns whether the species is transported by the model and
         //- provides the name of the diffused species

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C

@@ -1,72 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2015-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "interfaceCompositionModel.H"
-#include "phasePair.H"
-#include "rhoThermo.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::interfaceCompositionModel>
-Foam::interfaceCompositionModel::New
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-{
-    const word modelType
-    (
-        dict.get<word>("type")
-      + "<"
-      + pair.phase1().thermo().type()
-      + ","
-      + pair.phase2().thermo().type()
-      + ">"
-    );
-
-    Info<< "Selecting interfaceCompositionModel for "
-        << pair << ": " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "interfaceCompositionModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict, pair);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2018 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,10 +54,35 @@ Foam::massTransferModel::massTransferModel
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::massTransferModel::~massTransferModel()
-{}
+Foam::autoPtr<Foam::massTransferModel>
+Foam::massTransferModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting massTransferModel for "
+        << pair << ": " << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "massTransferModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair);
+}
 
 
 // ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 
 /*---------------------------------------------------------------------------*\
@@ -55,7 +57,7 @@ class massTransferModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -82,7 +84,7 @@ public:
         );
 
 
-    // Static data members
+    // Static Data Members
 
         //- Coefficient dimensions
         static const dimensionSet dimK;
@@ -99,7 +101,7 @@ public:
 
 
     //- Destructor
-    virtual ~massTransferModel();
+    virtual ~massTransferModel() = default;
 
 
     // Selectors

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModelNew.C

@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2015-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "massTransferModel.H"
-#include "phasePair.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::massTransferModel> Foam::massTransferModel::New
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting massTransferModel for "
-        << pair << ": " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "massTransferModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict, pair);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2018 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,10 +53,34 @@ Foam::saturationModel::saturationModel(const objectRegistry& db)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::saturationModel::~saturationModel()
-{}
+Foam::autoPtr<Foam::saturationModel>
+Foam::saturationModel::New
+(
+    const dictionary& dict,
+    const objectRegistry& db
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting saturationModel: " << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "saturationModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, db);
+}
 
 
 // ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +31,6 @@ Description
 
 SourceFiles
     saturationModel.C
-    newSaturationModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -57,11 +57,11 @@ class saturationModel
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        saturationModel(const saturationModel&);
+        //- No copy construct
+        saturationModel(const saturationModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const saturationModel&);
+        //- No copy assignment
+        void operator=(const saturationModel&) = delete;
 
 
 public:
@@ -85,13 +85,13 @@ public:
 
     // Constructors
 
-        //- Construct null
-        saturationModel(const objectRegistry& db);
+        //- Default constructed (from registry)
+        explicit saturationModel(const objectRegistry& db);
 
 
     // Selectors
 
-        //- Select null constructed
+        //- Select default constructed
         static autoPtr<saturationModel> New
         (
             const dictionary& dict,
@@ -100,7 +100,7 @@ public:
 
 
     //- Destructor
-    virtual ~saturationModel();
+    virtual ~saturationModel() = default;
 
 
     // Member Functions

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C

@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2015-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "saturationModel.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::saturationModel> Foam::saturationModel::New
-(
-    const dictionary& dict,
-    const objectRegistry& db
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting saturationModel: " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "saturationModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict, db);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2018 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -64,10 +65,35 @@ Foam::surfaceTensionModel::surfaceTensionModel
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::surfaceTensionModel::~surfaceTensionModel()
-{}
+Foam::autoPtr<Foam::surfaceTensionModel>
+Foam::surfaceTensionModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting surfaceTensionModel for "
+        << pair << ": " << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "surfaceTensionModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair, true);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +31,6 @@ Description
 
 SourceFiles
     surfaceTensionModel.C
-    newAspectRatioModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 
 /*---------------------------------------------------------------------------*\
@@ -58,7 +59,7 @@ class surfaceTensionModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -85,7 +86,7 @@ public:
     );
 
 
-    // Static data members
+    // Static Data Members
 
         //- Coefficient dimensions
         static const dimensionSet dimSigma;
@@ -103,7 +104,7 @@ public:
 
 
     //- Destructor
-    virtual ~surfaceTensionModel();
+    virtual ~surfaceTensionModel() = default;
 
 
     // Selectors

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C

@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2015-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "surfaceTensionModel.H"
-#include "phasePair.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::surfaceTensionModel >
-Foam::surfaceTensionModel::New
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting surfaceTensionModel for "
-        << pair << ": " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "surfaceTensionModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict, pair, true);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2018 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,10 +50,35 @@ Foam::aspectRatioModel::aspectRatioModel
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::aspectRatioModel::~aspectRatioModel()
-{}
+Foam::autoPtr<Foam::aspectRatioModel>
+Foam::aspectRatioModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting aspectRatioModel for "
+        << pair << ": " << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "swarmCorrection",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair);
+}
 
 
 // ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +31,6 @@ Description
 
 SourceFiles
     aspectRatioModel.C
-    newAspectRatioModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 
 /*---------------------------------------------------------------------------*\
@@ -56,7 +57,7 @@ class aspectRatioModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -93,7 +94,7 @@ public:
 
 
     //- Destructor
-    virtual ~aspectRatioModel();
+    virtual ~aspectRatioModel() = default;
 
 
     // Selectors

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C

@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2014-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "aspectRatioModel.H"
-#include "phasePair.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::aspectRatioModel>
-Foam::aspectRatioModel::New
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting aspectRatioModel for "
-        << pair << ": " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "swarmCorrection",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict, pair);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C

@@ -121,12 +121,6 @@ Foam::dragModels::AttouFerschneider::AttouFerschneider
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::dragModels::AttouFerschneider::~AttouFerschneider()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H

@@ -54,6 +54,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 class phaseModel;
 
@@ -68,7 +69,7 @@ class AttouFerschneider
 :
     public dragModel
 {
-    // Private data
+    // Private Data
 
         //- Name of the gaseous phase
         const word gasName_;
@@ -86,7 +87,7 @@ class AttouFerschneider
         const dimensionedScalar E2_;
 
 
-    // Private member functions
+    // Private Member Functions
 
         //- Return the momentum transfer coefficient between gas and liquid
         virtual tmp<volScalarField> KGasLiquid
@@ -128,7 +129,7 @@ public:
 
 
     //- Destructor
-    virtual ~AttouFerschneider();
+    virtual ~AttouFerschneider() = default;
 
 
     // Member Functions

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -98,6 +99,37 @@ Foam::dragModel::dragModel
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::dragModel>
+Foam::dragModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting dragModel for "
+        << pair << ": " << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "dragModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair, true);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::dragModel::~dragModel()

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +31,6 @@ Description
 
 SourceFiles
     dragModel.C
-    newDragModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 class swarmCorrection;
 
@@ -59,7 +60,7 @@ class dragModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -90,7 +91,7 @@ public:
         );
 
 
-    // Static data members
+    // Static Data Members
 
         //- Coefficient dimensions
         static const dimensionSet dimK;

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModelNew.C

@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "dragModel.H"
-#include "phasePair.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting dragModel for "
-        << pair << ": " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "dragModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict, pair, true);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,11 +65,35 @@ Foam::heatTransferModel::heatTransferModel
     )
 {}
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+Foam::autoPtr<Foam::heatTransferModel>
+Foam::heatTransferModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    const word modelType(dict.get<word>("type"));
 
-Foam::heatTransferModel::~heatTransferModel()
-{}
+    Info<< "Selecting heatTransferModel for "
+        << pair << ": " << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "heatTransferModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 
 /*---------------------------------------------------------------------------*\
@@ -55,7 +57,7 @@ class heatTransferModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -85,7 +87,7 @@ public:
         );
 
 
-    // Static data members
+    // Static Data Members
 
         //- Coefficient dimensions
         static const dimensionSet dimK;
@@ -102,7 +104,7 @@ public:
 
 
     //- Destructor
-    virtual ~heatTransferModel();
+    virtual ~heatTransferModel() = default;
 
 
     // Selectors

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C

@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "heatTransferModel.H"
-#include "phasePair.H"
-
-// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
-(
-    const dictionary& dict,
-    const phasePair& pair
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    Info<< "Selecting heatTransferModel for "
-        << pair << ": " << modelType << endl;
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInLookup
-        (
-            dict,
-            "heatTransferModel",
-            modelType,
-            *dictionaryConstructorTablePtr_
-        ) << abort(FatalIOError);
-    }
-
-    return cstrIter()(dict, pair);
-}
-
-
-// ************************************************************************* //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2018 OpenFOAM Foundation
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,10 +57,35 @@ Foam::liftModel::liftModel
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
 
-Foam::liftModel::~liftModel()
-{}
+Foam::autoPtr<Foam::liftModel>
+Foam::liftModel::New
+(
+    const dictionary& dict,
+    const phasePair& pair
+)
+{
+    const word modelType(dict.get<word>("type"));
+
+    Info<< "Selecting liftModel for "
+        << pair << ": " << modelType << endl;
+
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInLookup
+        (
+            dict,
+            "liftModel",
+            modelType,
+            *dictionaryConstructorTablePtr_
+        ) << abort(FatalIOError);
+    }
+
+    return cstrIter()(dict, pair);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +31,6 @@ Description
 
 SourceFiles
     liftModel.C
-    newLiftModel.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 
 /*---------------------------------------------------------------------------*\
@@ -56,7 +57,7 @@ class liftModel
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -83,7 +84,7 @@ public:
         );
 
 
-    // Static data members
+    // Static Data Members
 
         //- Force dimensions
         static const dimensionSet dimF;
@@ -100,7 +101,7 @@ public:
 
 
     //- Destructor
-    virtual ~liftModel();
+    virtual ~liftModel() = default;
 
 
     // Selectors