Rename Maxwell to UpperConvectedMaxwell model
This commit is contained in:
parent
d8f3e70326
commit
144505d9f2
3 changed files with 25 additions and 19 deletions
|
@ -6,7 +6,7 @@ viscoelasticLaws/viscoelasticLaw/newViscoelasticLaw.C
|
|||
viscoelasticLaws/LPTT/LPTT.C
|
||||
viscoelasticLaws/EPTT/EPTT.C
|
||||
viscoelasticLaws/Oldroyd-B/Oldroyd_B.C
|
||||
viscoelasticLaws/Maxwell/Maxwell.C
|
||||
viscoelasticLaws/UpperConvectedMaxwell/UpperConvectedMaxwell.C
|
||||
viscoelasticLaws/Giesekus/Giesekus.C
|
||||
viscoelasticLaws/FENE-CR/FENE_CR.C
|
||||
viscoelasticLaws/FENE-P/FENE_P.C
|
||||
|
|
|
@ -23,21 +23,26 @@ License
|
|||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "Maxwell.H"
|
||||
#include "UpperConvectedMaxwell.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
defineTypeNameAndDebug(Maxwell, 0);
|
||||
addToRunTimeSelectionTable(viscoelasticLaw, Maxwell, dictionary);
|
||||
defineTypeNameAndDebug(UpperConvectedMaxwell, 0);
|
||||
addToRunTimeSelectionTable
|
||||
(
|
||||
viscoelasticLaw,
|
||||
UpperConvectedMaxwell,
|
||||
dictionary
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::Maxwell::Maxwell
|
||||
Foam::UpperConvectedMaxwell::UpperConvectedMaxwell
|
||||
(
|
||||
const word& name,
|
||||
const volVectorField& U,
|
||||
|
@ -67,7 +72,8 @@ Foam::Maxwell::Maxwell
|
|||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
Foam::tmp<Foam::fvVectorMatrix> Foam::Maxwell::divTau(volVectorField& U) const
|
||||
Foam::tmp<Foam::fvVectorMatrix>
|
||||
Foam::UpperConvectedMaxwell::divTau(volVectorField& U) const
|
||||
{
|
||||
dimensionedScalar etaPEff = etaP_;
|
||||
|
||||
|
@ -80,7 +86,7 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::Maxwell::divTau(volVectorField& U) const
|
|||
}
|
||||
|
||||
|
||||
void Foam::Maxwell::correct()
|
||||
void Foam::UpperConvectedMaxwell::correct()
|
||||
{
|
||||
// Velocity gradient tensor
|
||||
const tmp<volTensorField> tL = fvc::grad(U());
|
|
@ -22,21 +22,21 @@ License
|
|||
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Class
|
||||
Maxwell
|
||||
UpperConvectedMaxwell
|
||||
|
||||
Description
|
||||
Maxwell linear viscoelastic fluid model (Maxwell, J.C., 1867).
|
||||
UpperConvectedMaxwell linear viscoelastic fluid model (UpperConvectedMaxwell, J.C., 1867).
|
||||
|
||||
Author
|
||||
Jovani L. Favero. All rights reserved
|
||||
|
||||
SourceFiles
|
||||
Maxwell.C
|
||||
UpperConvectedMaxwell.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef Maxwell_H
|
||||
#define Maxwell_H
|
||||
#ifndef UpperConvectedMaxwell_H
|
||||
#define UpperConvectedMaxwell_H
|
||||
|
||||
#include "viscoelasticLaw.H"
|
||||
|
||||
|
@ -46,10 +46,10 @@ namespace Foam
|
|||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class Maxwell Declaration
|
||||
Class UpperConvectedMaxwell Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class Maxwell
|
||||
class UpperConvectedMaxwell
|
||||
:
|
||||
public viscoelasticLaw
|
||||
{
|
||||
|
@ -77,21 +77,21 @@ class Maxwell
|
|||
// Private Member Functions
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
Maxwell(const Maxwell&);
|
||||
UpperConvectedMaxwell(const UpperConvectedMaxwell&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const Maxwell&);
|
||||
void operator=(const UpperConvectedMaxwell&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("Maxwell");
|
||||
TypeName("UpperConvectedMaxwell");
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from components
|
||||
Maxwell
|
||||
UpperConvectedMaxwell
|
||||
(
|
||||
const word& name,
|
||||
const volVectorField& U,
|
||||
|
@ -102,7 +102,7 @@ public:
|
|||
|
||||
// Destructor
|
||||
|
||||
virtual ~Maxwell()
|
||||
virtual ~UpperConvectedMaxwell()
|
||||
{}
|
||||
|
||||
|
Reference in a new issue