zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2018-04-10 21:53:30 +01:00
parent a908847b9c b9d7740e1f
commit 388b3107c8
28 changed files with 186 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,6 +58,8 @@ namespace Foam
{
using namespace interfaceCompositionModels;
// Gas-side models
// multi-component gas in the presence of a pure liquid
makeInterfaceCompositionType
(
@ -99,6 +101,46 @@ namespace Foam
multiComponentMixture,
constFluidEThermoPhysics
);
makeSpecieInterfaceCompositionType
(
NonRandomTwoLiquid,
heRhoThermo,
rhoReactionThermo,
multiComponentMixture,
constGasEThermoPhysics,
heRhoThermo,
rhoReactionThermo,
multiComponentMixture,
constFluidEThermoPhysics
);
// reacting gas in the presence of a multi-component liquid
makeSpecieInterfaceCompositionType
(
Saturated,
heRhoThermo,
rhoReactionThermo,
reactingMixture,
constGasEThermoPhysics,
heRhoThermo,
rhoReactionThermo,
multiComponentMixture,
constFluidEThermoPhysics
);
makeSpecieInterfaceCompositionType
(
NonRandomTwoLiquid,
heRhoThermo,
rhoReactionThermo,
reactingMixture,
constGasEThermoPhysics,
heRhoThermo,
rhoReactionThermo,
multiComponentMixture,
constFluidEThermoPhysics
);
// Liquid-side models
// multi-component liquid in the presence of a multi-component gas
makeSpecieInterfaceCompositionType
@ -113,6 +155,44 @@ namespace Foam
multiComponentMixture,
constGasEThermoPhysics
);
makeSpecieInterfaceCompositionType
(
Raoult,
heRhoThermo,
rhoReactionThermo,
multiComponentMixture,
constFluidEThermoPhysics,
heRhoThermo,
rhoReactionThermo,
multiComponentMixture,
constGasEThermoPhysics
);
// multi-component liquid in the presence of a reacting gas
makeSpecieInterfaceCompositionType
(
Henry,
heRhoThermo,
rhoReactionThermo,
multiComponentMixture,
constFluidEThermoPhysics,
heRhoThermo,
rhoReactionThermo,
reactingMixture,
constGasEThermoPhysics
);
makeSpecieInterfaceCompositionType
(
Raoult,
heRhoThermo,
rhoReactionThermo,
multiComponentMixture,
constFluidEThermoPhysics,
heRhoThermo,
rhoReactionThermo,
reactingMixture,
constGasEThermoPhysics
);
}
// ************************************************************************* //

2
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
View File

@ -155,7 +155,7 @@ update
const volScalarField& Tf
)
{
volScalarField W(this->thermo_.composition().W());
volScalarField W(this->thermo_.W());
volScalarField X1
(

2
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H
View File

@ -110,7 +110,7 @@ class NonRandomTwoLiquid
public:
//- Runtime type information
TypeName("NonRandomTwoLiquid");
TypeName("nonRandomTwoLiquid");
// Constructors

2
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H
View File

@ -82,7 +82,7 @@ protected:
public:
//- Runtime type information
TypeName("Saturated");
TypeName("saturated");
// Constructors

2
etc/caseDicts/postProcessing/visualization/streamlines.cfg
View File

@ -13,7 +13,7 @@ executeControl writeTime;
writeControl writeTime;
setFormat vtk;
trackForward true;
direction forward;
lifeTime 10000;
nSubCycle 5;

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
View File

@ -51,7 +51,7 @@ namespace Foam
class cyclicGAMGInterfaceField
:
public GAMGInterfaceField,
virtual public cyclicLduInterfaceField
public cyclicLduInterfaceField
{
// Private data

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
View File

@ -50,7 +50,7 @@ namespace Foam
class cyclicGAMGInterface
:
public GAMGInterface,
virtual public cyclicLduInterface
public cyclicLduInterface
{
// Private data

3
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,7 +88,6 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
const porousBafflePressureFvPatchField& ptf
)
:
cyclicLduInterfaceField(),
fixedJumpFvPatchField<scalar>(ptf),
phiName_(ptf.phiName_),
rhoName_(ptf.rhoName_),

6
src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -78,6 +78,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
)
:
coupledFvPatchField<Type>(ptf, p, iF, mapper),
cyclicLduInterfaceField(),
cyclicPatch_(refCast<const cyclicFvPatch>(p))
{
if (!isA<cyclicFvPatch>(this->patch()))
@ -98,8 +99,8 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
const cyclicFvPatchField<Type>& ptf
)
:
cyclicLduInterfaceField(),
coupledFvPatchField<Type>(ptf),
cyclicLduInterfaceField(),
cyclicPatch_(ptf.cyclicPatch_)
{}
@ -112,6 +113,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
)
:
coupledFvPatchField<Type>(ptf, iF),
cyclicLduInterfaceField(),
cyclicPatch_(ptf.cyclicPatch_)
{}

6
src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,8 +69,8 @@ namespace Foam
template<class Type>
class cyclicFvPatchField
:
virtual public cyclicLduInterfaceField,
public coupledFvPatchField<Type>
public coupledFvPatchField<Type>,
public cyclicLduInterfaceField
{
// Private data

12
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,8 +35,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
const DimensionedField<Type, volMesh>& iF
)
:
cyclicACMILduInterfaceField(),
coupledFvPatchField<Type>(p, iF),
cyclicACMILduInterfaceField(),
cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p))
{}
@ -49,8 +49,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
const dictionary& dict
)
:
cyclicACMILduInterfaceField(),
coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
cyclicACMILduInterfaceField(),
cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p))
{
if (!isA<cyclicACMIFvPatch>(p))
@ -82,8 +82,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
const fvPatchFieldMapper& mapper
)
:
cyclicACMILduInterfaceField(),
coupledFvPatchField<Type>(ptf, p, iF, mapper),
cyclicACMILduInterfaceField(),
cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p))
{
if (!isA<cyclicACMIFvPatch>(this->patch()))
@ -105,8 +105,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
const cyclicACMIFvPatchField<Type>& ptf
)
:
cyclicACMILduInterfaceField(),
coupledFvPatchField<Type>(ptf),
cyclicACMILduInterfaceField(),
cyclicACMIPatch_(ptf.cyclicACMIPatch_)
{}
@ -118,8 +118,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
const DimensionedField<Type, volMesh>& iF
)
:
cyclicACMILduInterfaceField(),
coupledFvPatchField<Type>(ptf, iF),
cyclicACMILduInterfaceField(),
cyclicACMIPatch_(ptf.cyclicACMIPatch_)
{}

6
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -68,8 +68,8 @@ namespace Foam
template<class Type>
class cyclicACMIFvPatchField
:
virtual public cyclicACMILduInterfaceField,
public coupledFvPatchField<Type>
public coupledFvPatchField<Type>,
public cyclicACMILduInterfaceField
{
// Private data

12
src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,8 +32,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
const DimensionedField<Type, volMesh>& iF
)
:
cyclicAMILduInterfaceField(),
coupledFvPatchField<Type>(p, iF),
cyclicAMILduInterfaceField(),
cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p))
{}
@ -46,8 +46,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
const dictionary& dict
)
:
cyclicAMILduInterfaceField(),
coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
cyclicAMILduInterfaceField(),
cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p))
{
if (!isA<cyclicAMIFvPatch>(p))
@ -79,8 +79,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
const fvPatchFieldMapper& mapper
)
:
cyclicAMILduInterfaceField(),
coupledFvPatchField<Type>(ptf, p, iF, mapper),
cyclicAMILduInterfaceField(),
cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p))
{
if (!isA<cyclicAMIFvPatch>(this->patch()))
@ -101,8 +101,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
const cyclicAMIFvPatchField<Type>& ptf
)
:
cyclicAMILduInterfaceField(),
coupledFvPatchField<Type>(ptf),
cyclicAMILduInterfaceField(),
cyclicAMIPatch_(ptf.cyclicAMIPatch_)
{}
@ -114,8 +114,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
const DimensionedField<Type, volMesh>& iF
)
:
cyclicAMILduInterfaceField(),
coupledFvPatchField<Type>(ptf, iF),
cyclicAMILduInterfaceField(),
cyclicAMIPatch_(ptf.cyclicAMIPatch_)
{}

6
src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,8 +73,8 @@ namespace Foam
template<class Type>
class cyclicAMIFvPatchField
:
virtual public cyclicAMILduInterfaceField,
public coupledFvPatchField<Type>
public coupledFvPatchField<Type>,
public cyclicAMILduInterfaceField
{
// Private data

37
src/functionObjects/field/streamLine/streamLine.C
View File

@ -45,6 +45,13 @@ namespace functionObjects
{
defineTypeNameAndDebug(streamLine, 0);
addToRunTimeSelectionTable(functionObject, streamLine, dictionary);
template<>
const char* NamedEnum<streamLine::trackDirection, 3>::names[] =
{"forward", "backward", "both"};
const NamedEnum<streamLine::trackDirection, 3>
streamLine::trackDirectionNames_;
}
}
@ -257,7 +264,9 @@ void Foam::functionObjects::streamLine::track()
vsInterp,
vvInterp,
UIndex, // index of U in vvInterp
trackForward_, // track in +u direction?
trackDirection_ == trackDirection::FORWARD,
nSubCycle_, // automatic track control:step through cells in steps?
trackLength_, // fixed track length
@ -266,13 +275,24 @@ void Foam::functionObjects::streamLine::track()
allVectors_
);
// Set very large dt. Note: cannot use great since 1/great is small
// which is a trigger value for the tracking...
const scalar trackTime = Foam::sqrt(great);
// Track
if (trackDirection_ == trackDirection::BOTH)
{
initialParticles = particles;
}
particles.move(particles, td, trackTime);
if (trackDirection_ == trackDirection::BOTH)
{
particles.IDLList<streamLineParticle>::operator=(initialParticles);
td.trackForward_ = !td.trackForward_;
particles.move(particles, td, trackTime);
}
}
@ -321,8 +341,19 @@ bool Foam::functionObjects::streamLine::read(const dictionary& dict)
<< exit(FatalIOError);
}
// The trackForward entry is maintained here for backwards compatibility
if (!dict.found("direction") && dict.found("trackForward"))
{
trackDirection_ =
dict.lookupType<bool>("trackForward")
? trackDirection::FORWARD
: trackDirection::BACKWARD;
}
else
{
trackDirection_ = trackDirectionNames_[word(dict.lookup("direction"))];
}
dict.lookup("trackForward") >> trackForward_;
dict.lookup("lifeTime") >> lifeTime_;
if (lifeTime_ < 1)
{

25
src/functionObjects/field/streamLine/streamLine.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -112,6 +112,7 @@ SourceFiles
#include "vectorList.H"
#include "writer.H"
#include "indirectPrimitivePatch.H"
#include "NamedEnum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -133,6 +134,24 @@ class streamLine
:
public fvMeshFunctionObject
{
public:
// Public data types
//- Track direction enumerations
enum trackDirection
{
FORWARD,
BACKWARD,
BOTH
};
//- Track direction enumeration names
static const NamedEnum<trackDirection, 3> trackDirectionNames_;
private:
// Private data
//- Input dictionary
@ -147,8 +166,8 @@ class streamLine
//- Interpolation scheme to use
word interpolationScheme_;
//- Whether to use +u or -u
bool trackForward_;
//- The direction in which to track
trackDirection trackDirection_;
//- Maximum lifetime (= number of cells) of particle
label lifeTime_;

4
src/functionObjects/field/streamLine/streamLineParticle.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,7 +77,7 @@ public:
const label UIndex_;
const bool trackForward_;
bool trackForward_;
const label nSubCycle_;

2
src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H
View File

@ -52,7 +52,7 @@ namespace Foam
class cyclicACMIGAMGInterfaceField
:
public GAMGInterfaceField,
virtual public cyclicACMILduInterfaceField
public cyclicACMILduInterfaceField
{
// Private data

2
src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
View File

@ -51,7 +51,7 @@ namespace Foam
class cyclicAMIGAMGInterfaceField
:
public GAMGInterfaceField,
virtual public cyclicAMILduInterfaceField
public cyclicAMILduInterfaceField
{
// Private data

2
src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H
View File

@ -50,7 +50,7 @@ namespace Foam
class cyclicACMIGAMGInterface
:
public GAMGInterface,
virtual public cyclicACMILduInterface
public cyclicACMILduInterface
{
// Private data

4
src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -50,7 +50,7 @@ namespace Foam
class cyclicAMIGAMGInterface
:
public GAMGInterface,
virtual public cyclicAMILduInterface
public cyclicAMILduInterface
{
// Private data

2
tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
View File

@ -54,7 +54,7 @@ functions
type streamLine;
writeControl writeTime;
setFormat vtk;
trackForward true;
direction forward;
fields (p U);
lifeTime 10000;
nSubCycle 5;

4
tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
View File

@ -16,8 +16,8 @@ streamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight;
// Tracked forwards (+U) or backwards (-U)
trackForward true;
// Track forward (+U) or backward (-U) or both
direction forward;
// Names of fields to sample. Should contain above velocity field!
fields (p U);

4
tutorials/incompressible/simpleFoam/motorBike/system/streamLines
View File

@ -19,8 +19,8 @@ streamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight;
// Tracked forwards (+U) or backwards (-U)
trackForward true;
// Track forward (+U) or backward (-U) or both
direction forward;
// Names of fields to sample. Should contain above velocity field!
fields (p U k);

4
tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
View File

@ -60,8 +60,8 @@ functions
setFormat vtk; //gnuplot;//xmgr;//raw;//jplot;//csv;//ensight;
// Tracked forwards (+U) or backwards (-U)
trackForward true;
// Track forward (+U) or backward (-U) or both
direction forward;
// Names of fields to sample. Should contain above velocity field!
fields (p k U);

2
tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties
View File

@ -137,7 +137,7 @@ interfaceComposition
(
(gas in liquid)
{
type Saturated;
type saturated;
species ( H2O );
Le 1.0;
saturationPressure

2
tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties
View File

@ -137,7 +137,7 @@ interfaceComposition
(
(gas in liquid)
{
type Saturated;
type saturated;
species ( H2O );
Le 1.0;
saturationPressure

2
tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
View File

@ -138,7 +138,7 @@ interfaceComposition
(
(gas in liquid)
{
type Saturated;
type saturated;
species ( water );
Le 1.0;
saturationPressure