mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
compressibleTwoPhaseEuler: Updated kinetic theory from 2.1.x
This commit is contained in:
@ -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
|
||||
|
||||
|
||||
@ -79,7 +79,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
|
||||
),
|
||||
radialModel_
|
||||
(
|
||||
radialModel::New
|
||||
kineticTheoryModels::radialModel::New
|
||||
(
|
||||
kineticTheoryProperties_
|
||||
)
|
||||
|
||||
@ -81,7 +81,7 @@ class kineticTheoryModel
|
||||
|
||||
autoPtr<conductivityModel> conductivityModel_;
|
||||
|
||||
autoPtr<radialModel> radialModel_;
|
||||
autoPtr<kineticTheoryModels::radialModel> radialModel_;
|
||||
|
||||
autoPtr<granularPressureModel> granularPressureModel_;
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -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)));
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -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
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -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)));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -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
|
||||
)
|
||||
|
||||
@ -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()
|
||||
{}
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -41,7 +41,7 @@ granularPressureModel Lun;
|
||||
|
||||
frictionalStressModel JohnsonJackson;
|
||||
|
||||
radialModel Gidaspow;
|
||||
radialModel SinclairJackson;
|
||||
|
||||
HrenyaSinclairCoeffs
|
||||
{
|
||||
|
||||
@ -41,7 +41,7 @@ granularPressureModel Lun;
|
||||
|
||||
frictionalStressModel JohnsonJackson;
|
||||
|
||||
radialModel Gidaspow;
|
||||
radialModel SinclairJackson;
|
||||
|
||||
HrenyaSinclairCoeffs
|
||||
{
|
||||
|
||||
@ -41,7 +41,7 @@ granularPressureModel Lun;
|
||||
|
||||
frictionalStressModel JohnsonJackson;
|
||||
|
||||
radialModel Gidaspow;
|
||||
radialModel SinclairJackson;
|
||||
|
||||
HrenyaSinclairCoeffs
|
||||
{
|
||||
|
||||
@ -41,7 +41,7 @@ granularPressureModel Lun;
|
||||
|
||||
frictionalStressModel JohnsonJackson;
|
||||
|
||||
radialModel Gidaspow;
|
||||
radialModel SinclairJackson;
|
||||
|
||||
HrenyaSinclairCoeffs
|
||||
{
|
||||
|
||||
@ -41,7 +41,7 @@ granularPressureModel Lun;
|
||||
|
||||
frictionalStressModel JohnsonJackson;
|
||||
|
||||
radialModel Gidaspow;
|
||||
radialModel SinclairJackson;
|
||||
|
||||
HrenyaSinclairCoeffs
|
||||
{
|
||||
|
||||
@ -41,7 +41,7 @@ granularPressureModel Lun;
|
||||
|
||||
frictionalStressModel JohnsonJackson;
|
||||
|
||||
radialModel Gidaspow;
|
||||
radialModel SinclairJackson;
|
||||
|
||||
HrenyaSinclairCoeffs
|
||||
{
|
||||
|
||||
@ -41,7 +41,7 @@ granularPressureModel Lun;
|
||||
|
||||
frictionalStressModel JohnsonJackson;
|
||||
|
||||
radialModel Gidaspow;
|
||||
radialModel SinclairJackson;
|
||||
|
||||
HrenyaSinclairCoeffs
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user