diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
index a6ff2ca0f0274499ca8c2a400e7b7c1d37f22d0c..758859e6bbb4b618f6d12537835ec797eb965a28 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/Make/files
@@ -16,7 +16,6 @@ conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
radialModel/radialModel/radialModel.C
radialModel/radialModel/newRadialModel.C
radialModel/CarnahanStarling/CarnahanStarlingRadial.C
-radialModel/Gidaspow/GidaspowRadial.C
radialModel/LunSavage/LunSavageRadial.C
radialModel/SinclairJackson/SinclairJacksonRadial.C
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 4aab54c86e2bd9eed959ba3e003d4c68de0de195..5a27c288da8b59e5966985d36b020dcceef2923f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -79,7 +79,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
),
radialModel_
(
- radialModel::New
+ kineticTheoryModels::radialModel::New
(
kineticTheoryProperties_
)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index faee38fbade1f72dc0d0d5cc7c265deef8613c1d..28ae38a9dba77271a165d6dff8a0183a86c58081 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -81,7 +81,7 @@ class kineticTheoryModel
autoPtr<conductivityModel> conductivityModel_;
- autoPtr<radialModel> radialModel_;
+ autoPtr<kineticTheoryModels::radialModel> radialModel_;
autoPtr<granularPressureModel> granularPressureModel_;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index 4fe5517b80ac44b7aa2f060adebd5b50cc5fcaa6..e250a89e79b3a3c3446cf4fdfe9dc1c579a4d738 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,20 +30,29 @@ License
namespace Foam
{
- defineTypeNameAndDebug(CarnahanStarlingRadial, 0);
+namespace kineticTheoryModels
+{
+namespace radialModels
+{
+ defineTypeNameAndDebug(CarnahanStarling, 0);
addToRunTimeSelectionTable
(
radialModel,
- CarnahanStarlingRadial,
+ CarnahanStarling,
dictionary
);
}
+}
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::CarnahanStarlingRadial::CarnahanStarlingRadial(const dictionary& dict)
+Foam::kineticTheoryModels::radialModels::CarnahanStarling::CarnahanStarling
+(
+ const dictionary& dict
+)
:
radialModel(dict)
{}
@@ -51,37 +60,38 @@ Foam::CarnahanStarlingRadial::CarnahanStarlingRadial(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::CarnahanStarlingRadial::~CarnahanStarlingRadial()
+Foam::kineticTheoryModels::radialModels::CarnahanStarling::~CarnahanStarling()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::CarnahanStarlingRadial::g0
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const
{
return
- 1.0/(1.0 - alpha1)
- + 3.0*alpha1/(2.0*sqr(1.0 - alpha1))
- + sqr(alpha1)/(2.0*pow(1.0 - alpha1, 3));
+ 1.0/(1.0 - alpha)
+ + 3.0*alpha/(2.0*sqr(1.0 - alpha))
+ + sqr(alpha)/(2.0*pow(1.0 - alpha, 3));
}
-Foam::tmp<Foam::volScalarField> Foam::CarnahanStarlingRadial::g0prime
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::radialModels::CarnahanStarling::g0prime
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const
{
return
- - alpha1/sqr(1.0 - alpha1)
- + (3.0*(1.0 - alpha1) + 6.0*sqr(alpha1))/(2.0*(1.0 - alpha1))
- + (2.0*alpha1*(1.0 - alpha1) + 3.0*pow(alpha1, 3))
- /(2.0*pow(1.0 - alpha1, 4));
+ 2.5/sqr(1.0 - alpha)
+ + 4.0*alpha/pow(1.0 - alpha, 3.0)
+ + 1.5*sqr(alpha)/pow(1.0 - alpha, 4.0);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
index ad92da890b5fe2fcc495da1871d321780d48d5c6..de5c24a1820785794e337500bfcecdcdd4c481b6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::CarnahanStarlingRadial
+ Foam::kineticTheoryModels::radialModels::CarnahanStarling
Description
@@ -31,8 +31,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef CarnahanStarlingRadial_H
-#define CarnahanStarlingRadial_H
+#ifndef CarnahanStarling_H
+#define CarnahanStarling_H
#include "radialModel.H"
@@ -40,12 +40,16 @@ SourceFiles
namespace Foam
{
+namespace kineticTheoryModels
+{
+namespace radialModels
+{
/*---------------------------------------------------------------------------*\
- Class CarnahanStarlingradial Declaration
+ Class CarnahanStarling Declaration
\*---------------------------------------------------------------------------*/
-class CarnahanStarlingRadial
+class CarnahanStarling
:
public radialModel
{
@@ -59,11 +63,11 @@ public:
// Constructors
//- Construct from components
- CarnahanStarlingRadial(const dictionary& dict);
+ CarnahanStarling(const dictionary& dict);
//- Destructor
- virtual ~CarnahanStarlingRadial();
+ virtual ~CarnahanStarling();
// Member Functions
@@ -71,13 +75,13 @@ public:
tmp<volScalarField> g0
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const;
tmp<volScalarField> g0prime
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const;
};
@@ -85,6 +89,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace radialModels
+} // End namespace kineticTheoryModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
deleted file mode 100644
index 2e633425f49480abba18626a84c2a6bbb39b7405..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C
+++ /dev/null
@@ -1,82 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-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 "GidaspowRadial.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
- defineTypeNameAndDebug(GidaspowRadial, 0);
-
- addToRunTimeSelectionTable
- (
- radialModel,
- GidaspowRadial,
- dictionary
- );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::GidaspowRadial::GidaspowRadial(const dictionary& dict)
-:
- radialModel(dict)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::GidaspowRadial::~GidaspowRadial()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField> Foam::GidaspowRadial::g0
-(
- const volScalarField& alpha1,
- const dimensionedScalar& alphaMax
-) const
-{
- return 0.6/(1.0 - pow(alpha1/alphaMax, 1.0/3.0));
-}
-
-
-Foam::tmp<Foam::volScalarField> Foam::GidaspowRadial::g0prime
-(
- const volScalarField& alpha1,
- const dimensionedScalar& alphaMax
-) const
-{
- return
- (-1.0/5.0)*pow(alpha1/alphaMax, -2.0/3.0)
- /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0)));
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
deleted file mode 100644
index ed5a83ecea3301c9431ed97d195fb4d06c92bfdf..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.H
+++ /dev/null
@@ -1,93 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-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/>.
-
-Class
- Foam::GidaspowRadial
-
-Description
-
-SourceFiles
- GidaspowRadial.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef GidaspowRadial_H
-#define GidaspowRadial_H
-
-#include "radialModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
- Class Gidaspowradial Declaration
-\*---------------------------------------------------------------------------*/
-
-class GidaspowRadial
-:
- public radialModel
-{
-
-public:
-
- //- Runtime type information
- TypeName("Gidaspow");
-
-
- // Constructors
-
- //- Construct from components
- GidaspowRadial(const dictionary& dict);
-
-
- //- Destructor
- virtual ~GidaspowRadial();
-
-
- // Member Functions
-
- tmp<volScalarField> g0
- (
- const volScalarField& alpha1,
- const dimensionedScalar& alphaMax
- ) const;
-
- tmp<volScalarField> g0prime
- (
- const volScalarField& alpha1,
- const dimensionedScalar& alphaMax
- ) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index 74cddedec8a44d4f32cf4f6c4dce9ac7abe4633c..58ba2a6210e2244251da11a2a00915b339f956a3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,20 +30,29 @@ License
namespace Foam
{
- defineTypeNameAndDebug(LunSavageRadial, 0);
+namespace kineticTheoryModels
+{
+namespace radialModels
+{
+ defineTypeNameAndDebug(LunSavage, 0);
addToRunTimeSelectionTable
(
radialModel,
- LunSavageRadial,
+ LunSavage,
dictionary
);
}
+}
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::LunSavageRadial::LunSavageRadial(const dictionary& dict)
+Foam::kineticTheoryModels::radialModels::LunSavage::LunSavage
+(
+ const dictionary& dict
+)
:
radialModel(dict)
{}
@@ -51,30 +60,32 @@ Foam::LunSavageRadial::LunSavageRadial(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::LunSavageRadial::~LunSavageRadial()
+Foam::kineticTheoryModels::radialModels::LunSavage::~LunSavage()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::LunSavageRadial::g0
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::radialModels::LunSavage::g0
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const
{
- return pow(1.0 - alpha1/alphaMax, -2.5*alphaMax);
+ return pow(1.0 - alpha/alphaMax, -2.5*alphaMax);
}
-Foam::tmp<Foam::volScalarField> Foam::LunSavageRadial::g0prime
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::radialModels::LunSavage::g0prime
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const
{
- return 2.5*alphaMax*alpha1*pow(1.0 - alpha1, -1.0 - 2.5*alphaMax);
+ return 2.5*pow(1.0 - alpha/alphaMax, -1.0 - 2.5*alphaMax);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
index fc8c2daad4153ab366a5ff3edd5dd6b3b265c1dc..1e95f838aecdf21c7da2aea675cb51af500de482 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,17 +22,17 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::LunSavageRadial
+ Foam::kineticTheoryModels::radialModels::LunSavage
Description
SourceFiles
- LunSavageRadial.C
+ LunSavage.C
\*---------------------------------------------------------------------------*/
-#ifndef LunSavageRadial_H
-#define LunSavageRadial_H
+#ifndef LunSavage_H
+#define LunSavage_H
#include "radialModel.H"
@@ -40,12 +40,16 @@ SourceFiles
namespace Foam
{
+namespace kineticTheoryModels
+{
+namespace radialModels
+{
/*---------------------------------------------------------------------------*\
- Class LunSavageradial Declaration
+ Class LunSavage Declaration
\*---------------------------------------------------------------------------*/
-class LunSavageRadial
+class LunSavage
:
public radialModel
{
@@ -59,24 +63,24 @@ public:
// Constructors
//- Construct from components
- LunSavageRadial(const dictionary& dict);
+ LunSavage(const dictionary& dict);
//- Destructor
- virtual ~LunSavageRadial();
+ virtual ~LunSavage();
// Member Functions
tmp<volScalarField> g0
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const;
tmp<volScalarField> g0prime
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const;
};
@@ -84,6 +88,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace radialModels
+} // End namespace kineticTheoryModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index dfe0fabd462c200c5378f8d6a9679b88118b243a..74e8dac729ef04ab239d5cc73dc5f91e36c42d72 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,20 +30,29 @@ License
namespace Foam
{
- defineTypeNameAndDebug(SinclairJacksonRadial, 0);
+namespace kineticTheoryModels
+{
+namespace radialModels
+{
+ defineTypeNameAndDebug(SinclairJackson, 0);
addToRunTimeSelectionTable
(
radialModel,
- SinclairJacksonRadial,
+ SinclairJackson,
dictionary
);
}
+}
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::SinclairJacksonRadial::SinclairJacksonRadial(const dictionary& dict)
+Foam::kineticTheoryModels::radialModels::SinclairJackson::SinclairJackson
+(
+ const dictionary& dict
+)
:
radialModel(dict)
{}
@@ -51,31 +60,33 @@ Foam::SinclairJacksonRadial::SinclairJacksonRadial(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::SinclairJacksonRadial::~SinclairJacksonRadial()
+Foam::kineticTheoryModels::radialModels::SinclairJackson::~SinclairJackson()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::SinclairJacksonRadial::g0
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::radialModels::SinclairJackson::g0
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const
{
- return 1.0/(1.0 - pow(alpha1/alphaMax, 1.0/3.0));
+ return 1.0/(1.0 - pow(alpha/alphaMax, 1.0/3.0));
}
-Foam::tmp<Foam::volScalarField> Foam::SinclairJacksonRadial::g0prime
+Foam::tmp<Foam::volScalarField>
+Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const
{
return
- (-1.0/3.0)*pow(alpha1/alphaMax, -2.0/3.0)
- /(alphaMax*sqr(1.0 - pow(alpha1/alphaMax, 1.0/3.0)));
+ (1.0/3.0)*pow(max(alpha, 1.0e-6)/alphaMax, -2.0/3.0)
+ /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
index 83349590d1ece0b6af6db8b774c511f31715245a..8df30f194513cc923060f1e5f5896b20f90fb094 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::SinclairJacksonRadial
+ Foam::SinclairJackson
Description
@@ -31,8 +31,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef SinclairJacksonRadial_H
-#define SinclairJacksonRadial_H
+#ifndef SinclairJackson_H
+#define SinclairJackson_H
#include "radialModel.H"
@@ -40,12 +40,16 @@ SourceFiles
namespace Foam
{
+namespace kineticTheoryModels
+{
+namespace radialModels
+{
/*---------------------------------------------------------------------------*\
- Class SinclairJacksonradial Declaration
+ Class SinclairJackson Declaration
\*---------------------------------------------------------------------------*/
-class SinclairJacksonRadial
+class SinclairJackson
:
public radialModel
{
@@ -59,24 +63,24 @@ public:
// Constructors
//- Construct from components
- SinclairJacksonRadial(const dictionary& dict);
+ SinclairJackson(const dictionary& dict);
//- Destructor
- virtual ~SinclairJacksonRadial();
+ virtual ~SinclairJackson();
// Member Functions
tmp<volScalarField> g0
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const;
tmp<volScalarField> g0prime
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const;
};
@@ -84,6 +88,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace radialModels
+} // End namespace kineticTheoryModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
index a4cf6a461eeac5a98f56acd505b5f85b20b79714..aa79335145b31dab7501b336fa3df44a2e06f452 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
@@ -27,7 +27,8 @@ License
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-Foam::autoPtr<Foam::radialModel> Foam::radialModel::New
+Foam::autoPtr<Foam::kineticTheoryModels::radialModel>
+Foam::kineticTheoryModels::radialModel::New
(
const dictionary& dict
)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.C
index d69a16696062d02c2313b95ca347d85e6e191a40..7caf81d366f8241ca8df1c79e57a2d39ee8d9839 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.C
@@ -28,16 +28,19 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
+{
+namespace kineticTheoryModels
{
defineTypeNameAndDebug(radialModel, 0);
defineRunTimeSelectionTable(radialModel, dictionary);
}
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::radialModel::radialModel
+Foam::kineticTheoryModels::radialModel::radialModel
(
const dictionary& dict
)
@@ -48,7 +51,7 @@ Foam::radialModel::radialModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::radialModel::~radialModel()
+Foam::kineticTheoryModels::radialModel::~radialModel()
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
index 5e88378ff53df22a7f14087fcc10f848f8d55ef9..bad05a99dff880b4adbb5b80c77af6ba03661763 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::radialModel
+ Foam::kineticTheoryModels::radialModel
SourceFiles
radialModel.C
@@ -41,6 +41,8 @@ SourceFiles
namespace Foam
{
+namespace kineticTheoryModels
+{
/*---------------------------------------------------------------------------*\
Class radialModel Declaration
@@ -105,14 +107,14 @@ public:
//- Radial distribution function
virtual tmp<volScalarField> g0
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const = 0;
//- Derivative of the radial distribution function
virtual tmp<volScalarField> g0prime
(
- const volScalarField& alpha1,
+ const volScalarField& alpha,
const dimensionedScalar& alphaMax
) const = 0;
};
@@ -120,6 +122,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace kineticTheoryModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
index 615c8cb1c48eedee826ccbb899ae653afbb9d60d..dd434c837468e4c3719d0f21153fa9edc5fd4ab9 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
@@ -41,7 +41,7 @@ granularPressureModel Lun;
frictionalStressModel JohnsonJackson;
-radialModel Gidaspow;
+radialModel SinclairJackson;
HrenyaSinclairCoeffs
{
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/kineticTheoryProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/kineticTheoryProperties
index 4433c0caf481d99d0aa9f982cf9d6dc73af4db2d..84660d86278e0440cba0defddad073cfa34caf66 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/kineticTheoryProperties
@@ -41,7 +41,7 @@ granularPressureModel Lun;
frictionalStressModel JohnsonJackson;
-radialModel Gidaspow;
+radialModel SinclairJackson;
HrenyaSinclairCoeffs
{
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
index 53521fbae309deb8893eed645ceaf0776fb9786a..2df50542e555669990b2caa032cf9aee7f92b8ad 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
@@ -41,7 +41,7 @@ granularPressureModel Lun;
frictionalStressModel JohnsonJackson;
-radialModel Gidaspow;
+radialModel SinclairJackson;
HrenyaSinclairCoeffs
{
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
index 53521fbae309deb8893eed645ceaf0776fb9786a..2df50542e555669990b2caa032cf9aee7f92b8ad 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
@@ -41,7 +41,7 @@ granularPressureModel Lun;
frictionalStressModel JohnsonJackson;
-radialModel Gidaspow;
+radialModel SinclairJackson;
HrenyaSinclairCoeffs
{
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
index 4433c0caf481d99d0aa9f982cf9d6dc73af4db2d..84660d86278e0440cba0defddad073cfa34caf66 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
@@ -41,7 +41,7 @@ granularPressureModel Lun;
frictionalStressModel JohnsonJackson;
-radialModel Gidaspow;
+radialModel SinclairJackson;
HrenyaSinclairCoeffs
{
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
index 53521fbae309deb8893eed645ceaf0776fb9786a..2df50542e555669990b2caa032cf9aee7f92b8ad 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
@@ -41,7 +41,7 @@ granularPressureModel Lun;
frictionalStressModel JohnsonJackson;
-radialModel Gidaspow;
+radialModel SinclairJackson;
HrenyaSinclairCoeffs
{
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
index 53521fbae309deb8893eed645ceaf0776fb9786a..2df50542e555669990b2caa032cf9aee7f92b8ad 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
@@ -41,7 +41,7 @@ granularPressureModel Lun;
frictionalStressModel JohnsonJackson;
-radialModel Gidaspow;
+radialModel SinclairJackson;
HrenyaSinclairCoeffs
{