Skip to content
Snippets Groups Projects
Commit 6ec38c4d authored by andy's avatar andy
Browse files

ENH: Updated spray sub-models to use new base class

parent 0a5584c3
Branches
Tags
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -33,7 +33,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel ...@@ -33,7 +33,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel
CloudType& owner CloudType& owner
) )
: :
SubModelBase<CloudType>(owner) CloudSubModelBase<CloudType>(owner)
{} {}
...@@ -43,7 +43,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel ...@@ -43,7 +43,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel
const AtomizationModel<CloudType>& am const AtomizationModel<CloudType>& am
) )
: :
SubModelBase<CloudType>(am) CloudSubModelBase<CloudType>(am)
{} {}
...@@ -55,7 +55,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel ...@@ -55,7 +55,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel
const word& type const word& type
) )
: :
SubModelBase<CloudType>(owner, dict, typeName, type) CloudSubModelBase<CloudType>(owner, dict, typeName, type)
{} {}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -39,7 +39,7 @@ SourceFiles ...@@ -39,7 +39,7 @@ SourceFiles
#include "IOdictionary.H" #include "IOdictionary.H"
#include "autoPtr.H" #include "autoPtr.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
#include "SubModelBase.H" #include "CloudSubModelBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -53,7 +53,7 @@ namespace Foam ...@@ -53,7 +53,7 @@ namespace Foam
template<class CloudType> template<class CloudType>
class AtomizationModel class AtomizationModel
: :
public SubModelBase<CloudType> public CloudSubModelBase<CloudType>
{ {
public: public:
......
...@@ -33,7 +33,7 @@ Foam::BreakupModel<CloudType>::BreakupModel ...@@ -33,7 +33,7 @@ Foam::BreakupModel<CloudType>::BreakupModel
CloudType& owner CloudType& owner
) )
: :
SubModelBase<CloudType>(owner), CloudSubModelBase<CloudType>(owner),
solveOscillationEq_(false), solveOscillationEq_(false),
y0_(0.0), y0_(0.0),
yDot0_(0.0), yDot0_(0.0),
...@@ -49,7 +49,7 @@ Foam::BreakupModel<CloudType>::BreakupModel ...@@ -49,7 +49,7 @@ Foam::BreakupModel<CloudType>::BreakupModel
const BreakupModel<CloudType>& bum const BreakupModel<CloudType>& bum
) )
: :
SubModelBase<CloudType>(bum), CloudSubModelBase<CloudType>(bum),
solveOscillationEq_(bum.solveOscillationEq_), solveOscillationEq_(bum.solveOscillationEq_),
y0_(bum.y0_), y0_(bum.y0_),
yDot0_(bum.yDot0_), yDot0_(bum.yDot0_),
...@@ -68,7 +68,7 @@ Foam::BreakupModel<CloudType>::BreakupModel ...@@ -68,7 +68,7 @@ Foam::BreakupModel<CloudType>::BreakupModel
bool solveOscillationEq bool solveOscillationEq
) )
: :
SubModelBase<CloudType>(owner, dict, typeName, type), CloudSubModelBase<CloudType>(owner, dict, typeName, type),
solveOscillationEq_(solveOscillationEq), solveOscillationEq_(solveOscillationEq),
y0_(0.0), y0_(0.0),
yDot0_(0.0), yDot0_(0.0),
......
...@@ -52,7 +52,7 @@ namespace Foam ...@@ -52,7 +52,7 @@ namespace Foam
template<class CloudType> template<class CloudType>
class BreakupModel class BreakupModel
: :
public SubModelBase<CloudType> public CloudSubModelBase<CloudType>
{ {
protected: protected:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment