Commit 037be8db authored by Mark Olesen's avatar Mark Olesen Committed by Andrew Heather
Browse files

STYLE: use default constructors/destructors for base cloud classes

- use cloud::defaultName instead of "defaultCloud" string literal
parent e90eafcf
......@@ -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
);
......
......@@ -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
......
......@@ -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
);
......
......@@ -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
);
......
......@@ -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()
{}
// ************************************************************************* //
......@@ -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;
};
......
......@@ -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
);
};
......
......@@ -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<injectedParticle>& c);
//- Write
//- Write fields
static void writeFields(const Cloud<injectedParticle>& c);
//- Write particle fields as objects into the obr registry
......
......@@ -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
);
......
......@@ -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()
{}
// ************************************************************************* //
......@@ -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
......
......@@ -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()
{}
// ************************************************************************* //
......@@ -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;
};
......
......@@ -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()
{}
// ************************************************************************* //
......@@ -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;
};
......
......@@ -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()
{}
// ************************************************************************* //
......@@ -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
......
......@@ -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<Cloud<basicKinematicParcel>> basicKinematicCloud;
typedef KinematicCloud
<
Cloud
<
basicKinematicParcel
>
> basicKinematicCloud;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -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.
......
......@@ -2,10 +2,8 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd |