From 037be8dbb046cc0f3d499479b48d9aeb5fee201f Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 2 Aug 2019 17:22:00 +0200 Subject: [PATCH] STYLE: use default constructors/destructors for base cloud classes - use cloud::defaultName instead of "defaultCloud" string literal --- .../passivePositionParticleCloud.H | 8 +++---- .../unmappedPassivePositionParticleCloud.H | 15 ++++++++----- .../streamLine/streamLineParticleCloud.H | 9 ++++---- .../wallBoundedStreamLineParticleCloud.H | 9 ++++---- .../baseClasses/DSMCBaseCloud/DSMCBaseCloud.C | 16 +------------- .../baseClasses/DSMCBaseCloud/DSMCBaseCloud.H | 18 ++++----------- .../indexedParticle/indexedParticleCloud.H | 10 ++++----- .../basic/injectedParticle/injectedParticle.H | 14 ++++-------- .../passiveParticle/passiveParticleCloud.H | 8 +++---- .../kinematicCloud/kinematicCloud.C | 16 +------------- .../kinematicCloud/kinematicCloud.H | 22 +++++-------------- .../baseClasses/reactingCloud/reactingCloud.C | 16 +------------- .../baseClasses/reactingCloud/reactingCloud.H | 18 ++++----------- .../reactingMultiphaseCloud.C | 16 +------------- .../reactingMultiphaseCloud.H | 14 +++--------- .../baseClasses/thermoCloud/thermoCloud.C | 16 +------------- .../baseClasses/thermoCloud/thermoCloud.H | 18 ++++----------- .../basicKinematicCloud/basicKinematicCloud.H | 10 ++++++--- .../basicKinematicCollidingCloud.H | 4 +--- .../basicKinematicMPPICCloud.H | 4 +--- .../basicReactingCloud/basicReactingCloud.H | 2 -- .../basicReactingMultiphaseCloud.H | 2 -- .../solidParticle/solidParticleCloud.H | 10 ++++----- .../clouds/Templates/SprayCloud/SprayCloud.H | 9 ++++---- .../baseClasses/sprayCloud/sprayCloud.C | 16 +------------- .../baseClasses/sprayCloud/sprayCloud.H | 17 +++----------- 26 files changed, 83 insertions(+), 234 deletions(-) diff --git a/applications/utilities/parallelProcessing/redistributePar/passivePositionParticleCloud.H b/applications/utilities/parallelProcessing/redistributePar/passivePositionParticleCloud.H index 388e6b19dd..26a9e46dc5 100644 --- a/applications/utilities/parallelProcessing/redistributePar/passivePositionParticleCloud.H +++ b/applications/utilities/parallelProcessing/redistributePar/passivePositionParticleCloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,10 +68,10 @@ public: // Constructors //- Construct given mesh - passivePositionParticleCloud + explicit passivePositionParticleCloud ( - const polyMesh&, - const word& cloudName = "defaultCloud", + const polyMesh& mesh, + const word& cloudName = cloud::defaultName, bool readFields = true ); diff --git a/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H b/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H index a6a1aa81c6..fda9611ed9 100644 --- a/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H +++ b/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2015 OpenFOAM Foundation @@ -59,10 +59,10 @@ public: // Constructors //- Construct given mesh - unmappedPassivePositionParticleCloud + explicit unmappedPassivePositionParticleCloud ( const polyMesh& mesh, - const word& cloudName = "defaultCloud", + const word& cloudName = cloud::defaultName, bool readFields = true ) : @@ -80,9 +80,12 @@ public: passivePositionParticleCloud(mesh, cloudName, particles) {} - //- Destructor - virtual ~unmappedPassivePositionParticleCloud() - {} + + //- Destructor + virtual ~unmappedPassivePositionParticleCloud() = default; + + + // Member Functions //- Switch off remapping of cells of particles when // mesh topology changes diff --git a/src/functionObjects/field/streamLine/streamLineParticleCloud.H b/src/functionObjects/field/streamLine/streamLineParticleCloud.H index 00e05057af..57a1485e92 100644 --- a/src/functionObjects/field/streamLine/streamLineParticleCloud.H +++ b/src/functionObjects/field/streamLine/streamLineParticleCloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2016 OpenFOAM Foundation @@ -67,13 +67,14 @@ public: //- Type of parcel the cloud was instantiated for typedef streamLineParticle parcelType; + // Constructors //- Construct given mesh - streamLineParticleCloud + explicit streamLineParticleCloud ( - const polyMesh&, - const word& cloudName = "defaultCloud", + const polyMesh& mesh, + const word& cloudName = cloud::defaultName, bool readFields = true ); diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H index f76c6562ab..e03c922b04 100644 --- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H +++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2016 OpenFOAM Foundation @@ -70,13 +70,14 @@ public: //- Type of parcel the cloud was instantiated for typedef wallBoundedStreamLineParticle parcelType; + // Constructors //- Construct given mesh - wallBoundedStreamLineParticleCloud + explicit wallBoundedStreamLineParticleCloud ( - const polyMesh&, - const word& cloudName = "defaultCloud", + const polyMesh& mesh, + const word& cloudName = cloud::defaultName, bool readFields = true ); diff --git a/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C index 04878b04d5..41d2b1da46 100644 --- a/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C +++ b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2011-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,16 +33,4 @@ namespace Foam } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::DSMCBaseCloud::DSMCBaseCloud() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::DSMCBaseCloud::~DSMCBaseCloud() -{} - - // ************************************************************************* // diff --git a/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H index e40eb40a1c..8b1cdaca0c 100644 --- a/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H +++ b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2011-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -50,27 +48,19 @@ namespace Foam class DSMCBaseCloud { - // Private Member Functions - - //- No copy construct - DSMCBaseCloud(const DSMCBaseCloud&) = delete; - - //- No copy assignment - void operator=(const DSMCBaseCloud&) = delete; - - public: //- Runtime type information TypeName("DSMCBaseCloud"); + // Constructors //- Null constructor - DSMCBaseCloud(); + DSMCBaseCloud() = default; //- Destructor - virtual ~DSMCBaseCloud(); + virtual ~DSMCBaseCloud() = default; }; diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H index 30ceec63e6..bd9581c831 100644 --- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H +++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2004-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -67,10 +65,10 @@ public: // Constructors //- Construct given mesh - indexedParticleCloud + explicit indexedParticleCloud ( - const polyMesh&, - const word& cloudName = "defaultCloud", + const polyMesh& mesh, + const word& cloudName = cloud::defaultName, bool readFields = true ); }; diff --git a/src/lagrangian/basic/injectedParticle/injectedParticle.H b/src/lagrangian/basic/injectedParticle/injectedParticle.H index d506f244cf..2d68154234 100644 --- a/src/lagrangian/basic/injectedParticle/injectedParticle.H +++ b/src/lagrangian/basic/injectedParticle/injectedParticle.H @@ -51,15 +51,9 @@ SeeAlso namespace Foam { +// Forward declarations class injectedParticle; - -// Forward declaration of friend functions - -Ostream& operator<< -( - Ostream&, - const injectedParticle& -); +Ostream& operator<<(Ostream&, const injectedParticle&); /*---------------------------------------------------------------------------*\ Class injectedParticle Declaration @@ -210,10 +204,10 @@ public: // I-O - //- Read + //- Read fields static void readFields(Cloud& c); - //- Write + //- Write fields static void writeFields(const Cloud& c); //- Write particle fields as objects into the obr registry diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H index 1893a77abc..111eabb38d 100644 --- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H +++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011 OpenFOAM Foundation @@ -67,10 +67,10 @@ public: // Constructors //- Construct given mesh - passiveParticleCloud + explicit passiveParticleCloud ( - const polyMesh&, - const word& cloudName = "defaultCloud", + const polyMesh& mesh, + const word& cloudName = cloud::defaultName, bool readFields = true ); diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C index 63ed0e9b22..21b3492bcb 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2008-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,16 +33,4 @@ namespace Foam } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::kinematicCloud::kinematicCloud() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // - -Foam::kinematicCloud::~kinematicCloud() -{} - - // ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H index f6f53277f3..f2f439c8f4 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2008-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2016 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -51,15 +49,6 @@ namespace Foam class kinematicCloud { - // Private Member Functions - - //- No copy construct - kinematicCloud(const kinematicCloud&) = delete; - - //- No copy assignment - void operator=(const kinematicCloud&) = delete; - - public: //- Runtime type information @@ -69,17 +58,18 @@ public: // Constructors //- Null constructor - kinematicCloud(); + kinematicCloud() = default; + //- Destructor - virtual ~kinematicCloud(); + virtual ~kinematicCloud() = default; - // Member functions + // Member Functions // Check - //- Number of parcels + //- Number of parcels virtual label nParcels() const = 0; //- Total mass in system diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.C index 99e5078a60..eade626f3b 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.C +++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.C @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2008-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,16 +33,4 @@ namespace Foam } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::reactingCloud::reactingCloud() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // - -Foam::reactingCloud::~reactingCloud() -{} - - // ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H index 3f5e1471d3..3a3f7e3db5 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2008-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -50,28 +48,20 @@ namespace Foam class reactingCloud { - // Private Member Functions - - //- No copy construct - reactingCloud(const reactingCloud&) = delete; - - //- No copy assignment - void operator=(const reactingCloud&) = delete; - - public: //- Runtime type information TypeName("reactingCloud"); + // Constructors //- Null constructor - reactingCloud(); + reactingCloud() = default; //- Destructor - virtual ~reactingCloud(); + virtual ~reactingCloud() = default; }; diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C index e49701de60..440a0e5faf 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2009-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,16 +33,4 @@ namespace Foam } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::reactingMultiphaseCloud::reactingMultiphaseCloud() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // - -Foam::reactingMultiphaseCloud::~reactingMultiphaseCloud() -{} - - // ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H index 39c5431687..12a80c11de 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H @@ -50,28 +50,20 @@ namespace Foam class reactingMultiphaseCloud { - // Private Member Functions - - //- No copy construct - reactingMultiphaseCloud(const reactingMultiphaseCloud&) = delete; - - //- No copy assignment - void operator=(const reactingMultiphaseCloud&) = delete; - - public: //- Runtime type information TypeName("reactingMultiphaseCloud"); + // Constructors //- Null constructor - reactingMultiphaseCloud(); + reactingMultiphaseCloud() = default; //- Destructor - virtual ~reactingMultiphaseCloud(); + virtual ~reactingMultiphaseCloud() = default; }; diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.C index 429d6f4ec7..bf1c3cad37 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.C +++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.C @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2008-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,16 +33,4 @@ namespace Foam } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::thermoCloud::thermoCloud() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // - -Foam::thermoCloud::~thermoCloud() -{} - - // ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H index c51fb74f0d..67ec9d2ef3 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2008-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -50,28 +48,20 @@ namespace Foam class thermoCloud { - // Private Member Functions - - //- No copy construct - thermoCloud(const thermoCloud&) = delete; - - //- No copy assignment - void operator=(const thermoCloud&) = delete; - - public: //- Runtime type information TypeName("thermoCloud"); + // Constructors //- Null constructor - thermoCloud(); + thermoCloud() = default; //- Destructor - virtual ~thermoCloud(); + virtual ~thermoCloud() = default; // Member Functions diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H index d4a18ad873..06e2a3568c 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H @@ -4,8 +4,6 @@ \\ / O peration | \\ / A nd | \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2016 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -42,7 +40,13 @@ Description namespace Foam { - typedef KinematicCloud> basicKinematicCloud; + typedef KinematicCloud + < + Cloud + < + basicKinematicParcel + > + > basicKinematicCloud; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCollidingCloud/basicKinematicCollidingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCollidingCloud/basicKinematicCollidingCloud.H index b151e2b5b7..7e5a18b543 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCollidingCloud/basicKinematicCollidingCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCollidingCloud/basicKinematicCollidingCloud.H @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2011 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicMPPICCloud/basicKinematicMPPICCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicMPPICCloud/basicKinematicMPPICCloud.H index 9b12e00a97..9805298fe5 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicKinematicMPPICCloud/basicKinematicMPPICCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicMPPICCloud/basicKinematicMPPICCloud.H @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2013 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2013 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H index dead16d2ba..917091d916 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H @@ -4,8 +4,6 @@ \\ / O peration | \\ / A nd | \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H index 6265abe723..68fad51197 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H @@ -4,8 +4,6 @@ \\ / O peration | \\ / A nd | \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. diff --git a/src/lagrangian/solidParticle/solidParticleCloud.H b/src/lagrangian/solidParticle/solidParticleCloud.H index 86f533c0e5..cf7f6d4997 100644 --- a/src/lagrangian/solidParticle/solidParticleCloud.H +++ b/src/lagrangian/solidParticle/solidParticleCloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2017 OpenFOAM Foundation @@ -48,7 +48,7 @@ SourceFiles namespace Foam { -// Forward declaration of classes +// Forward Declarations class fvMesh; /*---------------------------------------------------------------------------*\ @@ -84,10 +84,10 @@ public: // Constructors //- Construct given mesh - solidParticleCloud + explicit solidParticleCloud ( - const fvMesh&, - const word& cloudName = "defaultCloud", + const fvMesh& mesh, + const word& cloudName = cloud::defaultName, bool readFields = true ); diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H index f9437e011e..54d61a6df1 100644 --- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H +++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H @@ -45,12 +45,11 @@ Description namespace Foam { -// Forward declaration of classes -template -class AtomizationModel; +// Forward Declarations +template class AtomizationModel; +template class BreakupModel; +template class SprayCloud; -template -class BreakupModel; /*---------------------------------------------------------------------------*\ Class SprayCloud Declaration diff --git a/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.C b/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.C index 96989b68d4..c16cb54a4f 100644 --- a/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.C +++ b/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.C @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2011-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,16 +33,4 @@ namespace Foam } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::sprayCloud::sprayCloud() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // - -Foam::sprayCloud::~sprayCloud() -{} - - // ************************************************************************* // diff --git a/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H b/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H index ba27cd1f98..5bbda6e428 100644 --- a/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H +++ b/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H @@ -2,10 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2011-2019 OpenCFD Ltd. \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -50,15 +48,6 @@ namespace Foam class sprayCloud { - // Private Member Functions - - //- No copy construct - sprayCloud(const sprayCloud&) = delete; - - //- No copy assignment - void operator=(const sprayCloud&) = delete; - - public: //- Runtime type information @@ -67,11 +56,11 @@ public: // Constructors //- Null constructor - sprayCloud(); + sprayCloud() = default; //- Destructor - virtual ~sprayCloud(); + virtual ~sprayCloud() = default; };