OpenFOAM: v1912 released! - For more information see https://www.openfoam.com/releases/openfoam-v1912

Commit ecbaf732 authored by Mark Olesen's avatar Mark Olesen

STYLE: spelling, default destructor

parent f6dce11a
...@@ -25,7 +25,8 @@ Class ...@@ -25,7 +25,8 @@ Class
Foam::entrainmentModels::ErrosionEnergy Foam::entrainmentModels::ErrosionEnergy
Description Description
An entrainment model following the errosion energy apporach (see Rauter et al. 2016). An entrainment model following the errosion energy apporach
(see Rauter et al. 2016).
SourceFiles SourceFiles
Erosionenergy.C Erosionenergy.C
...@@ -68,12 +69,12 @@ class Erosionenergy ...@@ -68,12 +69,12 @@ class Erosionenergy
{ {
// Private data // Private data
//Specific erroision energy parameter e_b //- Specific erosion energy parameter e_b
dimensionedScalar eb_; dimensionedScalar eb_;
//Pointer to the gravitation fields //- Reference to the gravitation fields
const areaVectorField &gs_; const areaVectorField& gs_;
const areaScalarField &gn_; const areaScalarField& gn_;
public: public:
...@@ -83,7 +84,7 @@ public: ...@@ -83,7 +84,7 @@ public:
// Constructors // Constructors
//- construct from components //- Construct from components
Erosionenergy Erosionenergy
( (
const word& name, const word& name,
...@@ -96,10 +97,8 @@ public: ...@@ -96,10 +97,8 @@ public:
); );
// Destructor //- Destructor
virtual ~Erosionenergy() = default;
virtual ~Erosionenergy()
{}
// Member Functions // Member Functions
......
...@@ -50,7 +50,6 @@ Author ...@@ -50,7 +50,6 @@ Author
#include "faMatrices.H" #include "faMatrices.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
...@@ -68,7 +67,7 @@ class Front ...@@ -68,7 +67,7 @@ class Front
{ {
// Private data // Private data
//Height threshold //- Height threshold
dimensionedScalar htrigger_; dimensionedScalar htrigger_;
...@@ -85,18 +84,16 @@ public: ...@@ -85,18 +84,16 @@ public:
( (
const word& name, const word& name,
const dictionary& frictionProperties, const dictionary& frictionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &hentrain, const areaScalarField& hentrain,
const areaScalarField &pb, const areaScalarField& pb,
const areaVectorField &tau const areaVectorField& tau
); );
// Destructor //- Destructor
virtual ~Front() = default;
virtual ~Front()
{}
// Member Functions // Member Functions
......
...@@ -68,18 +68,18 @@ class IsslerFC ...@@ -68,18 +68,18 @@ class IsslerFC
{ {
// Private data // Private data
//Maximum shear stress tau_c //- Maximum shear stress tau_c
dimensionedScalar tauc_; dimensionedScalar tauc_;
//Kinetic Theory mu //- Kinetic Theory mu
dimensionedScalar mu_; dimensionedScalar mu_;
//Kinetic Theory K //- Kinetic Theory K
dimensionedScalar K_; dimensionedScalar K_;
//Pointer to the gravitation fields //- Reference to the gravitation fields
const areaVectorField &gs_; const areaVectorField& gs_;
const areaScalarField &gn_; const areaScalarField& gn_;
public: public:
...@@ -89,23 +89,21 @@ public: ...@@ -89,23 +89,21 @@ public:
// Constructors // Constructors
//- construct from components //- Construct from components
IsslerFC IsslerFC
( (
const word& name, const word& name,
const dictionary& frictionProperties, const dictionary& frictionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &hentrain, const areaScalarField& hentrain,
const areaScalarField &pb, const areaScalarField& pb,
const areaVectorField &tau const areaVectorField& tau
); );
// Destructor //- Destructor
virtual ~IsslerFC() = default;
virtual ~IsslerFC()
{}
// Member Functions // Member Functions
......
...@@ -68,13 +68,13 @@ class Medina ...@@ -68,13 +68,13 @@ class Medina
{ {
// Private data // Private data
//Cohesion of the basal material at bottom //- Cohesion of the basal material at bottom
dimensionedScalar tauc_; dimensionedScalar tauc_;
//Friction coefficient tan(phi) of the basal material //- Friction coefficient tan(phi) of the basal material
dimensionedScalar mu_; dimensionedScalar mu_;
//Pointer to the gravitation fields //- Reference to the gravitation fields
const areaVectorField &gs_; const areaVectorField &gs_;
const areaScalarField &gn_; const areaScalarField &gn_;
...@@ -99,10 +99,8 @@ public: ...@@ -99,10 +99,8 @@ public:
); );
// Destructor //- Destructor
virtual ~Medina() = default;
virtual ~Medina()
{}
// Member Functions // Member Functions
......
...@@ -74,9 +74,9 @@ class Stopingprofile ...@@ -74,9 +74,9 @@ class Stopingprofile
//Formfactor for deposition curve //Formfactor for deposition curve
dimensionedScalar ad_; dimensionedScalar ad_;
//Pointer to the gravitation fields //- Reference to the gravitation fields
const areaVectorField &gs_; const areaVectorField& gs_;
const areaScalarField &gn_; const areaScalarField& gn_;
public: public:
...@@ -86,22 +86,21 @@ public: ...@@ -86,22 +86,21 @@ public:
// Constructors // Constructors
//- construct from components //- Construct from components
Stopingprofile Stopingprofile
(const word& name, (
const word& name,
const dictionary& frictionProperties, const dictionary& frictionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &hentrain, const areaScalarField& hentrain,
const areaScalarField &pb, const areaScalarField& pb,
const areaVectorField &tau const areaVectorField& tau
); );
// Destructor //- Destructor
virtual ~Stopingprofile() = default;
virtual ~Stopingprofile()
{}
// Member Functions // Member Functions
......
...@@ -66,44 +66,43 @@ namespace Foam ...@@ -66,44 +66,43 @@ namespace Foam
class depositionModel class depositionModel
{ {
protected: protected:
// Protected data // Protected data
word name_; word name_;
dictionary depositionProperties_;
dictionary depositionProperties_;
//The density //- The density
dimensionedScalar rho_; dimensionedScalar rho_;
//Pointer to the surface velocity field //- Reference to the surface velocity field
const areaVectorField &Us_; const areaVectorField &Us_;
//Pointer to the flow height field //- Reference to the flow height field
const areaScalarField &h_; const areaScalarField &h_;
//Pointer to the cover height field //- Reference to the cover height field
const areaScalarField &hentrain_; const areaScalarField &hentrain_;
//Pointer to the basal pressure field //- Reference to the basal pressure field
const areaScalarField &pb_; const areaScalarField &pb_;
//Pointer to the bottom stress field //- Reference to the bottom stress field
const areaVectorField &tau_; const areaVectorField &tau_;
//Sink term //- Sink term
mutable areaScalarField Sd_; mutable areaScalarField Sd_;
// Private Member Functions // Private Member Functions
//- Disallow copy construct //- Disallow copy construct
depositionModel(const depositionModel&); depositionModel(const depositionModel&) = delete;
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const depositionModel&); void operator=(const depositionModel&) = delete;
public: public:
...@@ -123,11 +122,11 @@ public: ...@@ -123,11 +122,11 @@ public:
( (
const word& name, const word& name,
const dictionary& depositionProperties, const dictionary& depositionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &hentrain, const areaScalarField& hentrain,
const areaScalarField &pb, const areaScalarField& pb,
const areaVectorField &tau const areaVectorField& tau
), ),
(name, depositionProperties, Us, h, hentrain, pb, tau) (name, depositionProperties, Us, h, hentrain, pb, tau)
); );
...@@ -141,11 +140,11 @@ public: ...@@ -141,11 +140,11 @@ public:
( (
const word& name, const word& name,
const dictionary& depositionProperties, const dictionary& depositionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &hentrain, const areaScalarField& hentrain,
const areaScalarField &pb, const areaScalarField& pb,
const areaVectorField &tau const areaVectorField& tau
); );
...@@ -153,20 +152,19 @@ public: ...@@ -153,20 +152,19 @@ public:
//- Construct from components //- Construct from components
depositionModel depositionModel
(const word& name, (
const word& name,
const dictionary& depositionProperties, const dictionary& depositionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &hentrain, const areaScalarField& hentrain,
const areaScalarField &pb, const areaScalarField& pb,
const areaVectorField &tau const areaVectorField& tau
); );
// Destructor //- Destructor
virtual ~depositionModel() = default;
virtual ~depositionModel()
{}
// Member Functions // Member Functions
......
...@@ -21,8 +21,6 @@ License ...@@ -21,8 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::depositionModel::depositionOff Foam::depositionModel::depositionOff
...@@ -49,7 +47,6 @@ Author ...@@ -49,7 +47,6 @@ Author
#include "faMatrices.H" #include "faMatrices.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
...@@ -58,7 +55,7 @@ namespace depositionModels ...@@ -58,7 +55,7 @@ namespace depositionModels
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class Erosionenergy Declaration Class depositionOff Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class depositionOff class depositionOff
...@@ -80,18 +77,16 @@ public: ...@@ -80,18 +77,16 @@ public:
( (
const word& name, const word& name,
const dictionary& frictionProperties, const dictionary& frictionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &hentrain, const areaScalarField& hentrain,
const areaScalarField &pb, const areaScalarField& pb,
const areaVectorField &tau const areaVectorField& tau
); );
// Destructor //- Destructor
virtual ~depositionOff() = default;
virtual ~depositionOff()
{}
// Member Functions // Member Functions
......
...@@ -74,35 +74,35 @@ protected: ...@@ -74,35 +74,35 @@ protected:
word name_; word name_;
dictionary entrainmentProperties_; dictionary entrainmentProperties_;
//The density //- The density
dimensionedScalar rho_; dimensionedScalar rho_;
//Pointer to the surface velocity field //- Reference to the surface velocity field
const areaVectorField &Us_; const areaVectorField &Us_;
//Pointer to the flow height field //- Reference to the flow height field
const areaScalarField &h_; const areaScalarField &h_;
//Pointer to the cover height field //- Reference to the cover height field
const areaScalarField &hentrain_; const areaScalarField &hentrain_;
//Pointer to the basal pressure field //- Reference to the basal pressure field
const areaScalarField &pb_; const areaScalarField& pb_;
//Pointer to the bottom stress field //- Reference to the bottom stress field
const areaVectorField &tau_; const areaVectorField& tau_;
//Source term //- Source term
mutable areaScalarField Sm_; mutable areaScalarField Sm_;
// Private Member Functions // Private Member Functions
//- Disallow copy construct //- Disallow copy construct
entrainmentModel(const entrainmentModel&); entrainmentModel(const entrainmentModel&) = delete;
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const entrainmentModel&); void operator=(const entrainmentModel&) = delete;
public: public:
...@@ -152,26 +152,25 @@ public: ...@@ -152,26 +152,25 @@ public:
//- Construct from components //- Construct from components
entrainmentModel entrainmentModel
(const word& name, (
const word& name,
const dictionary& entrainmentProperties, const dictionary& entrainmentProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &hentrain, const areaScalarField& hentrain,
const areaScalarField &pb, const areaScalarField& pb,
const areaVectorField &tau const areaVectorField& tau
); );
// Destructor //- Destructor
virtual ~entrainmentModel() = default;
virtual ~entrainmentModel()
{}
// Member Functions // Member Functions
//- Return the Source by entrainment //- Return the Source by entrainment
virtual const areaScalarField &Sm() const = 0; virtual const areaScalarField& Sm() const = 0;
//- Return the entrainment properties dictionary //- Return the entrainment properties dictionary
const dictionary& entrainmentProperties() const const dictionary& entrainmentProperties() const
......
...@@ -82,24 +82,24 @@ public: ...@@ -82,24 +82,24 @@ public:
( (
const word& name, const word& name,
const dictionary& frictionProperties, const dictionary& frictionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &p const areaScalarField& p
); );
// Destructor //- Destructor
virtual ~DarcyWeisbach() = default;
virtual ~DarcyWeisbach()
{}
// Member Functions // Member Functions
//- Return explicit coefficients for the linear system of equatiosn considering friction //- Return explicit coefficients for the linear system of equations
//- considering friction
virtual const areaVectorField& tauSc() const; virtual const areaVectorField& tauSc() const;
//- Return implicit coefficients for the linear system of equatiosn considering friction //- Return implicit coefficients for the linear system of equations
//- considering friction
virtual const areaScalarField& tauSp() const; virtual const areaScalarField& tauSp() const;
......
...@@ -21,7 +21,6 @@ License ...@@ -21,7 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::frictionModels::ManningStrickler Foam::frictionModels::ManningStrickler
...@@ -58,7 +57,7 @@ namespace frictionModels ...@@ -58,7 +57,7 @@ namespace frictionModels
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class DaryWeisbach Declaration Class ManningStrickler Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class ManningStrickler class ManningStrickler
...@@ -82,24 +81,24 @@ public: ...@@ -82,24 +81,24 @@ public:
( (
const word& name, const word& name,
const dictionary& frictionProperties, const dictionary& frictionProperties,
const areaVectorField &Us, const areaVectorField& Us,
const areaScalarField &h, const areaScalarField& h,
const areaScalarField &p const areaScalarField& p
); );
// Destructor //- Destructor
virtual ~ManningStrickler() = default;
virtual ~ManningStrickler()
{}
// Member Functions // Member Functions
//- Return explicit coefficients for the linear system of equatiosn considering friction //- Return explicit coefficients for the linear system of equations
//- considering friction
virtual const areaVectorField &tauSc() const