zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Initial commit after latest foundation merge

Browse Source
This commit is contained in:
andy
2016-04-25 11:40:48 +01:00
parent 69ae5a9a78 e5a029c187
commit fd9d801e2d
4003 changed files with 74634 additions and 37783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -47,7 +47,7 @@ void Foam::BlendedInterfacialModel<modelType>::correctFixedFluxBCs
)
{
field.boundaryField()[patchI]
= pTraits<typename GeometricField::value_type>::zero;
= Zero;
}
}
}
@ -155,17 +155,17 @@ Foam::BlendedInterfacialModel<modelType>::K() const
if (model_.valid())
{
x() += model_->K()*(f1() - f2());
x.ref() += model_->K()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->K()*(1 - f1);
x.ref() += model1In2_->K()*(1 - f1);
}
if (model2In1_.valid())
{
x() += model2In1_->K()*f2;
x.ref() += model2In1_->K()*f2;
}
if
@ -174,7 +174,7 @@ Foam::BlendedInterfacialModel<modelType>::K() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;
@ -223,17 +223,17 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
if (model_.valid())
{
x() += model_->Kf()*(f1() - f2());
x.ref() += model_->Kf()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->Kf()*(1 - f1);
x.ref() += model1In2_->Kf()*(1 - f1);
}
if (model2In1_.valid())
{
x() += model2In1_->Kf()*f2;
x.ref() += model2In1_->Kf()*f2;
}
if
@ -242,7 +242,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;
@ -251,7 +251,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
template<class modelType>
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::BlendedInterfacialModel<modelType>::F() const
{
tmp<volScalarField> f1, f2;
@ -266,7 +266,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
f2 = blending_.f2(pair1In2_.dispersed(), pair2In1_.dispersed());
}
tmp<GeometricField<Type, fvPatchField, volMesh> > x
tmp<GeometricField<Type, fvPatchField, volMesh>> x
(
new GeometricField<Type, fvPatchField, volMesh>
(
@ -280,23 +280,23 @@ Foam::BlendedInterfacialModel<modelType>::F() const
false
),
pair_.phase1().mesh(),
dimensioned<Type>("zero", modelType::dimF, pTraits<Type>::zero)
dimensioned<Type>("zero", modelType::dimF, Zero)
)
);
if (model_.valid())
{
x() += model_->F()*(f1() - f2());
x.ref() += model_->F()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->F()*(1 - f1);
x.ref() += model1In2_->F()*(1 - f1);
}
if (model2In1_.valid())
{
x() -= model2In1_->F()*f2; // note : subtraction
x.ref() -= model2In1_->F()*f2; // note : subtraction
}
if
@ -305,7 +305,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;
@ -354,17 +354,17 @@ Foam::BlendedInterfacialModel<modelType>::Ff() const
if (model_.valid())
{
x() += model_->Ff()*(f1() - f2());
x.ref() += model_->Ff()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->Ff()*(1 - f1);
x.ref() += model1In2_->Ff()*(1 - f1);
}
if (model2In1_.valid())
{
x() -= model2In1_->Ff()*f2; // note : subtraction
x.ref() -= model2In1_->Ff()*f2; // note : subtraction
}
if
@ -373,7 +373,7 @@ Foam::BlendedInterfacialModel<modelType>::Ff() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;
@ -416,17 +416,17 @@ Foam::BlendedInterfacialModel<modelType>::D() const
if (model_.valid())
{
x() += model_->D()*(f1() - f2());
x.ref() += model_->D()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->D()*(1 - f1);
x.ref() += model1In2_->D()*(1 - f1);
}
if (model2In1_.valid())
{
x() += model2In1_->D()*f2;
x.ref() += model2In1_->D()*f2;
}
if
@ -435,7 +435,7 @@ Foam::BlendedInterfacialModel<modelType>::D() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;

4
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -128,7 +128,7 @@ public:
//- Return the blended force
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> > F() const;
tmp<GeometricField<Type, fvPatchField, volMesh>> F() const;
//- Return the face blended force
tmp<surfaceScalarField> Ff() const;

5
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,6 +34,7 @@ License
#include "fixedValueFvPatchFields.H"
#include "slipFvPatchFields.H"
#include "partialSlipFvPatchFields.H"
#include "fvcFlux.H"
#include "surfaceInterpolate.H"
@ -175,7 +176,7 @@ Foam::phaseModel::phaseModel
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
fvc::interpolate(U_) & fluid_.mesh().Sf(),
fvc::flux(U_),
phiTypes
)
);

4
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -97,7 +97,7 @@ class phaseModel
autoPtr<diameterModel> dPtr_;
//- Turbulence model
autoPtr<PhaseCompressibleTurbulenceModel<phaseModel> > turbulence_;
autoPtr<PhaseCompressibleTurbulenceModel<phaseModel>> turbulence_;
public:

16
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,7 +54,7 @@ class wallLubricationModel;
class turbulentDispersionModel;
class blendingMethod;
template <class modelType> class BlendedInterfacialModel;
template<class modelType> class BlendedInterfacialModel;
/*---------------------------------------------------------------------------*\
Class twoPhaseSystem Declaration
@ -97,23 +97,23 @@ class twoPhaseSystem
HashTable<autoPtr<blendingMethod>, word, word::hash> blendingMethods_;
//- Drag model
autoPtr<BlendedInterfacialModel<dragModel> > drag_;
autoPtr<BlendedInterfacialModel<dragModel>> drag_;
//- Virtual mass model
autoPtr<BlendedInterfacialModel<virtualMassModel> > virtualMass_;
autoPtr<BlendedInterfacialModel<virtualMassModel>> virtualMass_;
//- Heat transfer model
autoPtr<BlendedInterfacialModel<heatTransferModel> > heatTransfer_;
autoPtr<BlendedInterfacialModel<heatTransferModel>> heatTransfer_;
//- Lift model
autoPtr<BlendedInterfacialModel<liftModel> > lift_;
autoPtr<BlendedInterfacialModel<liftModel>> lift_;
//- Wall lubrication model
autoPtr<BlendedInterfacialModel<wallLubricationModel> >
autoPtr<BlendedInterfacialModel<wallLubricationModel>>
wallLubrication_;
//- Wall lubrication model
autoPtr<BlendedInterfacialModel<turbulentDispersionModel> >
autoPtr<BlendedInterfacialModel<turbulentDispersionModel>>
turbulentDispersion_;