zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiphaseEulerFoam::interfaceSurfaceTensionModels: Renamed from surfaceTensionModels -> interfaceSurfaceTensionModels

Browse Source 
to avoid name clash with the VoF surfaceTensionModels when both the
multiphaseEulerFoam and compressibleInterFoam libraries are linked into a single
executable.
This commit is contained in:
Henry Weller
2022-08-08 12:09:52 +01:00
parent 73ad954f78
commit b65d4ad48a
10 changed files with 64 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/files
View File

@ -3,9 +3,9 @@ diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferMode
diffusiveMassTransferModels/Frossling/Frossling.C
diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C
surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C
interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C
interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C

15
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C → applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
View File

@ -30,12 +30,12 @@ License
namespace Foam
{
namespace surfaceTensionModels
namespace interfaceSurfaceTensionModels
{
defineTypeNameAndDebug(constantSurfaceTensionCoefficient, 0);
addToRunTimeSelectionTable
(
surfaceTensionModel,
interfaceSurfaceTensionModel,
constantSurfaceTensionCoefficient,
dictionary
);
@ -45,21 +45,21 @@ namespace surfaceTensionModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::surfaceTensionModels::constantSurfaceTensionCoefficient::
Foam::interfaceSurfaceTensionModels::constantSurfaceTensionCoefficient::
constantSurfaceTensionCoefficient
(
const dictionary& dict,
const phaseInterface& interface
)
:
surfaceTensionModel(dict, interface),
interfaceSurfaceTensionModel(dict, interface),
sigma_("sigma", dimSigma, dict)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::surfaceTensionModels::constantSurfaceTensionCoefficient::
Foam::interfaceSurfaceTensionModels::constantSurfaceTensionCoefficient::
~constantSurfaceTensionCoefficient()
{}
@ -67,7 +67,8 @@ Foam::surfaceTensionModels::constantSurfaceTensionCoefficient::
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField>
Foam::surfaceTensionModels::constantSurfaceTensionCoefficient::sigma() const
Foam::interfaceSurfaceTensionModels::constantSurfaceTensionCoefficient::
sigma() const
{
return volScalarField::New
(
@ -79,7 +80,7 @@ Foam::surfaceTensionModels::constantSurfaceTensionCoefficient::sigma() const
Foam::tmp<Foam::scalarField>
Foam::surfaceTensionModels::constantSurfaceTensionCoefficient::sigma
Foam::interfaceSurfaceTensionModels::constantSurfaceTensionCoefficient::sigma
(
const label patchi
) const

10
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H → applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::surfaceTensionModels::constantSurfaceTensionCoefficient
Foam::interfaceSurfaceTensionModels::constantSurfaceTensionCoefficient
Description
Constant value surface tension model.
@ -35,13 +35,13 @@ SourceFiles
#ifndef constantSurfaceTensionCoefficient_H
#define constantSurfaceTensionCoefficient_H
#include "surfaceTensionModel.H"
#include "interfaceSurfaceTensionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace surfaceTensionModels
namespace interfaceSurfaceTensionModels
{
/*---------------------------------------------------------------------------*\
@ -50,7 +50,7 @@ namespace surfaceTensionModels
class constantSurfaceTensionCoefficient
:
public surfaceTensionModel
public interfaceSurfaceTensionModel
{
// Private Data
@ -90,7 +90,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace surfaceTensionModels
} // End namespace interfaceSurfaceTensionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

15
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C → applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C
View File

@ -23,22 +23,25 @@ License
\*---------------------------------------------------------------------------*/
#include "surfaceTensionModel.H"
#include "interfaceSurfaceTensionModel.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineTypeNameAndDebug(surfaceTensionModel, 0);
defineRunTimeSelectionTable(surfaceTensionModel, dictionary);
defineTypeNameAndDebug(interfaceSurfaceTensionModel, 0);
defineRunTimeSelectionTable(interfaceSurfaceTensionModel, dictionary);
}
const Foam::dimensionSet Foam::surfaceTensionModel::dimSigma(1, 0, -2, 0, 0);
const Foam::dimensionSet Foam::interfaceSurfaceTensionModel::dimSigma
(
1, 0, -2, 0, 0
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::surfaceTensionModel::surfaceTensionModel
Foam::interfaceSurfaceTensionModel::interfaceSurfaceTensionModel
(
const dictionary& dict,
const phaseInterface& interface
@ -50,7 +53,7 @@ Foam::surfaceTensionModel::surfaceTensionModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::surfaceTensionModel::~surfaceTensionModel()
Foam::interfaceSurfaceTensionModel::~interfaceSurfaceTensionModel()
{}

26
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H → applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H
View File

@ -22,18 +22,20 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::surfaceTensionModel
Foam::interfaceSurfaceTensionModel
Description
Abstract base-class for interface surface-tension models which can be
used when interface compression is applied between two phases.
SourceFiles
surfaceTensionModel.C
aspectRatioModelNew.C
interfaceSurfaceTensionModel.C
interfaceSurfaceTensionModelNew.C
\*---------------------------------------------------------------------------*/
#ifndef surfaceTensionModel_H
#define surfaceTensionModel_H
#ifndef interfaceSurfaceTensionModel_H
#define interfaceSurfaceTensionModel_H
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -46,10 +48,10 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class surfaceTensionModel Declaration
Class interfaceSurfaceTensionModel Declaration
\*---------------------------------------------------------------------------*/
class surfaceTensionModel
class interfaceSurfaceTensionModel
{
protected:
@ -62,14 +64,14 @@ protected:
public:
//- Runtime type information
TypeName("surfaceTensionModel");
TypeName("interfaceSurfaceTensionModel");
// Declare runtime construction
declareRunTimeSelectionTable
(
autoPtr,
surfaceTensionModel,
interfaceSurfaceTensionModel,
dictionary,
(
const dictionary& dict,
@ -88,7 +90,7 @@ public:
// Constructors
//- Construct from a dictionary and an interface
surfaceTensionModel
interfaceSurfaceTensionModel
(
const dictionary& dict,
const phaseInterface& interface
@ -96,12 +98,12 @@ public:
//- Destructor
virtual ~surfaceTensionModel();
virtual ~interfaceSurfaceTensionModel();
// Selectors
static autoPtr<surfaceTensionModel> New
static autoPtr<interfaceSurfaceTensionModel> New
(
const dictionary& dict,
const phaseInterface& interface,

22
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C → applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C
View File

@ -23,13 +23,13 @@ License
\*---------------------------------------------------------------------------*/
#include "surfaceTensionModel.H"
#include "interfaceSurfaceTensionModel.H"
#include "phaseSystem.H"
// * * * * * * * * * * * * * * * * Selector * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::surfaceTensionModel >
Foam::surfaceTensionModel::New
Foam::autoPtr<Foam::interfaceSurfaceTensionModel >
Foam::interfaceSurfaceTensionModel::New
(
const dictionary& dict,
const phaseInterface& interface,
@ -38,23 +38,23 @@ Foam::surfaceTensionModel::New
{
const dictionary& modelDict =
outer
? interface.fluid().modelSubDict<surfaceTensionModel>(dict)
? interface.fluid().modelSubDict<interfaceSurfaceTensionModel>(dict)
: dict;
const word surfaceTensionModelType(modelDict.lookup("type"));
const word interfaceSurfaceTensionModelType(modelDict.lookup("type"));
Info<< "Selecting surfaceTensionModel for "
<< interface.name() << ": " << surfaceTensionModelType << endl;
Info<< "Selecting interfaceSurfaceTensionModel for "
<< interface.name() << ": " << interfaceSurfaceTensionModelType << endl;
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(surfaceTensionModelType);
dictionaryConstructorTablePtr_->find(interfaceSurfaceTensionModelType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorInFunction
<< "Unknown surfaceTensionModelType type "
<< surfaceTensionModelType << endl << endl
<< "Valid surfaceTensionModel types are : " << endl
<< "Unknown interfaceSurfaceTensionModelType type "
<< interfaceSurfaceTensionModelType << endl << endl
<< "Valid interfaceSurfaceTensionModel types are : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}

2
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseInterface/phaseInterface/phaseInterface.C
View File

@ -25,7 +25,7 @@ License
#include "phaseInterface.H"
#include "phaseSystem.H"
#include "surfaceTensionModel.H"
#include "interfaceSurfaceTensionModel.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

16
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "phaseSystem.H"
#include "surfaceTensionModel.H"
#include "interfaceSurfaceTensionModel.H"
#include "surfaceInterpolate.H"
#include "fvcDdt.H"
#include "localEulerDdtScheme.H"
@ -310,7 +310,7 @@ Foam::phaseSystem::phaseSystem
}
// Surface tension models
generateInterfacialModels(surfaceTensionModels_);
generateInterfacialModels(interfaceSurfaceTensionModels_);
// Update motion fields
correctKinematics();
@ -405,17 +405,17 @@ Foam::tmp<Foam::volVectorField> Foam::phaseSystem::U() const
Foam::tmp<Foam::volScalarField>
Foam::phaseSystem::sigma(const phaseInterfaceKey& key) const
{
if (surfaceTensionModels_.found(key))
if (interfaceSurfaceTensionModels_.found(key))
{
return surfaceTensionModels_[key]->sigma();
return interfaceSurfaceTensionModels_[key]->sigma();
}
else
{
return volScalarField::New
(
surfaceTensionModel::typeName + ":sigma",
interfaceSurfaceTensionModel::typeName + ":sigma",
mesh_,
dimensionedScalar(surfaceTensionModel::dimSigma, 0)
dimensionedScalar(interfaceSurfaceTensionModel::dimSigma, 0)
);
}
}
@ -424,9 +424,9 @@ Foam::phaseSystem::sigma(const phaseInterfaceKey& key) const
Foam::tmp<Foam::scalarField>
Foam::phaseSystem::sigma(const phaseInterfaceKey& key, const label patchi) const
{
if (surfaceTensionModels_.found(key))
if (interfaceSurfaceTensionModels_.found(key))
{
return surfaceTensionModels_[key]->sigma(patchi);
return interfaceSurfaceTensionModels_[key]->sigma(patchi);
}
else
{

8
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
View File

@ -58,7 +58,7 @@ SourceFiles
namespace Foam
{
class surfaceTensionModel;
class interfaceSurfaceTensionModel;
class pressureReference;
class nonOrthogonalSolutionControl;
@ -111,11 +111,11 @@ protected:
typedef
HashTable
<
autoPtr<surfaceTensionModel>,
autoPtr<interfaceSurfaceTensionModel>,
phaseInterfaceKey,
phaseInterfaceKey::hash
>
surfaceTensionModelTable;
interfaceSurfaceTensionModelTable;
typedef HashTable<scalar, phaseInterfaceKey, phaseInterfaceKey::hash>
cAlphaTable;
@ -164,7 +164,7 @@ protected:
// Sub Models
//- Surface tension models
surfaceTensionModelTable surfaceTensionModels_;
interfaceSurfaceTensionModelTable interfaceSurfaceTensionModels_;
//- Flag to indicate that returned lists of fields are "complete"; i.e.,

2
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C
View File

@ -30,7 +30,7 @@ License
#include "binaryBreakupModel.H"
#include "driftModel.H"
#include "nucleationModel.H"
#include "surfaceTensionModel.H"
#include "interfaceSurfaceTensionModel.H"
#include "fvmDdt.H"
#include "fvmDiv.H"
#include "fvmSup.H"