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

Standardised naming of multicomponent thermophysical properties: multiComponent -> multicomponent

Browse Source 
Full backward-compatibility is provided which support for both multiComponentMixture and
multiComponentPhaseModel provided but all tutorials have been updated.
This commit is contained in:
Henry Weller
2022-07-29 17:28:07 +01:00
parent 5196e09fe2
commit 3efe097c69
67 changed files with 248 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/chemFoam/chemFoam.C
View File

@ -35,7 +35,7 @@ Description
#include "zeroDimensionalFvMesh.H"
#include "fluidMulticomponentThermo.H"
#include "basicChemistryModel.H"
#include "multiComponentMixture.H"
#include "multicomponentMixture.H"
#include "chemistrySolver.H"
#include "OFstream.H"
#include "basicSpecieMixture.H"

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/YEqns.H
View File

@ -7,9 +7,9 @@
fluid.correctReactions();
forAll(fluid.multiComponentPhases(), multiComponentPhasei)
forAll(fluid.multicomponentPhases(), multicomponentPhasei)
{
phaseModel& phase = fluid.multiComponentPhases()[multiComponentPhasei];
phaseModel& phase = fluid.multicomponentPhases()[multicomponentPhasei];
UPtrList<volScalarField>& Y = phase.YActiveRef();
const volScalarField& alpha = phase;

22
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C → applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "MultiComponentPhaseModel.H"
#include "MulticomponentPhaseModel.H"
#include "phaseSystem.H"
@ -38,7 +38,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class BasePhaseModel>
Foam::MultiComponentPhaseModel<BasePhaseModel>::MultiComponentPhaseModel
Foam::MulticomponentPhaseModel<BasePhaseModel>::MulticomponentPhaseModel
(
const phaseSystem& fluid,
const word& phaseName,
@ -65,14 +65,14 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::MultiComponentPhaseModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class BasePhaseModel>
Foam::MultiComponentPhaseModel<BasePhaseModel>::~MultiComponentPhaseModel()
Foam::MulticomponentPhaseModel<BasePhaseModel>::~MulticomponentPhaseModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class BasePhaseModel>
void Foam::MultiComponentPhaseModel<BasePhaseModel>::correctSpecies()
void Foam::MulticomponentPhaseModel<BasePhaseModel>::correctSpecies()
{
this->thermo_->composition().normalise();
BasePhaseModel::correctSpecies();
@ -80,7 +80,7 @@ void Foam::MultiComponentPhaseModel<BasePhaseModel>::correctSpecies()
template<class BasePhaseModel>
bool Foam::MultiComponentPhaseModel<BasePhaseModel>::pure() const
bool Foam::MulticomponentPhaseModel<BasePhaseModel>::pure() const
{
return false;
}
@ -88,7 +88,7 @@ bool Foam::MultiComponentPhaseModel<BasePhaseModel>::pure() const
template<class BasePhaseModel>
Foam::tmp<Foam::fvScalarMatrix>
Foam::MultiComponentPhaseModel<BasePhaseModel>::YiEqn(volScalarField& Yi)
Foam::MulticomponentPhaseModel<BasePhaseModel>::YiEqn(volScalarField& Yi)
{
const volScalarField& alpha = *this;
const volScalarField& rho = this->thermo().rho();
@ -119,7 +119,7 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::YiEqn(volScalarField& Yi)
template<class BasePhaseModel>
const Foam::PtrList<Foam::volScalarField>&
Foam::MultiComponentPhaseModel<BasePhaseModel>::Y() const
Foam::MulticomponentPhaseModel<BasePhaseModel>::Y() const
{
return this->thermo_->composition().Y();
}
@ -127,7 +127,7 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::Y() const
template<class BasePhaseModel>
const Foam::volScalarField&
Foam::MultiComponentPhaseModel<BasePhaseModel>::Y(const word& name) const
Foam::MulticomponentPhaseModel<BasePhaseModel>::Y(const word& name) const
{
return this->thermo_->composition().Y(name);
}
@ -135,7 +135,7 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::Y(const word& name) const
template<class BasePhaseModel>
Foam::PtrList<Foam::volScalarField>&
Foam::MultiComponentPhaseModel<BasePhaseModel>::YRef()
Foam::MulticomponentPhaseModel<BasePhaseModel>::YRef()
{
return this->thermo_->composition().Y();
}
@ -143,7 +143,7 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::YRef()
template<class BasePhaseModel>
const Foam::UPtrList<Foam::volScalarField>&
Foam::MultiComponentPhaseModel<BasePhaseModel>::YActive() const
Foam::MulticomponentPhaseModel<BasePhaseModel>::YActive() const
{
return YActive_;
}
@ -151,7 +151,7 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::YActive() const
template<class BasePhaseModel>
Foam::UPtrList<Foam::volScalarField>&
Foam::MultiComponentPhaseModel<BasePhaseModel>::YActiveRef()
Foam::MulticomponentPhaseModel<BasePhaseModel>::YActiveRef()
{
return YActive_;
}

18
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H → applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.H
View File

@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::MultiComponentPhaseModel
Foam::MulticomponentPhaseModel
Description
Class which represents a phase with multiple species. Returns the species'
mass fractions, and their governing equations.
SourceFiles
MultiComponentPhaseModel.C
MulticomponentPhaseModel.C
\*---------------------------------------------------------------------------*/
#ifndef MultiComponentPhaseModel_H
#define MultiComponentPhaseModel_H
#ifndef MulticomponentPhaseModel_H
#define MulticomponentPhaseModel_H
#include "phaseModel.H"
@ -44,11 +44,11 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class MultiComponentPhaseModel Declaration
Class MulticomponentPhaseModel Declaration
\*---------------------------------------------------------------------------*/
template<class BasePhaseModel>
class MultiComponentPhaseModel
class MulticomponentPhaseModel
:
public BasePhaseModel
{
@ -64,7 +64,7 @@ public:
// Constructors
MultiComponentPhaseModel
MulticomponentPhaseModel
(
const phaseSystem& fluid,
const word& phaseName,
@ -74,7 +74,7 @@ public:
//- Destructor
virtual ~MultiComponentPhaseModel();
virtual ~MulticomponentPhaseModel();
// Member Functions
@ -114,7 +114,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "MultiComponentPhaseModel.C"
#include "MulticomponentPhaseModel.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

28
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C
View File

@ -35,7 +35,7 @@ License
#include "IsothermalPhaseModel.H"
#include "AnisothermalPhaseModel.H"
#include "PurePhaseModel.H"
#include "MultiComponentPhaseModel.H"
#include "MulticomponentPhaseModel.H"
#include "InertPhaseModel.H"
#include "ReactingPhaseModel.H"
#include "MovingPhaseModel.H"
@ -144,7 +144,7 @@ namespace Foam
typedef
AnisothermalPhaseModel
<
MultiComponentPhaseModel
MulticomponentPhaseModel
<
InertPhaseModel
<
@ -155,12 +155,22 @@ namespace Foam
>
>
>
multiComponentPhaseModel;
multicomponentPhaseModel;
addNamedToRunTimeSelectionTable
(
phaseModel,
multiComponentPhaseModel,
multicomponentPhaseModel,
phaseSystem,
multicomponentPhaseModel
);
// Also add multicomponentPhaseModel with the name multiComponentPhaseModel
// for backward-compatibility
addNamedToRunTimeSelectionTable
(
phaseModel,
multicomponentPhaseModel,
phaseSystem,
multiComponentPhaseModel
);
@ -168,7 +178,7 @@ namespace Foam
typedef
IsothermalPhaseModel
<
MultiComponentPhaseModel
MulticomponentPhaseModel
<
InertPhaseModel
<
@ -179,20 +189,20 @@ namespace Foam
>
>
>
multiComponentIsothermalPhaseModel;
multicomponentIsothermalPhaseModel;
addNamedToRunTimeSelectionTable
(
phaseModel,
multiComponentIsothermalPhaseModel,
multicomponentIsothermalPhaseModel,
phaseSystem,
multiComponentIsothermalPhaseModel
multicomponentIsothermalPhaseModel
);
typedef
AnisothermalPhaseModel
<
MultiComponentPhaseModel
MulticomponentPhaseModel
<
ReactingPhaseModel
<

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

@ -261,24 +261,24 @@ Foam::phaseSystem::phaseSystem
label movingPhasei = 0;
label stationaryPhasei = 0;
label anisothermalPhasei = 0;
label multiComponentPhasei = 0;
label multicomponentPhasei = 0;
forAll(phaseModels_, phasei)
{
phaseModel& phase = phaseModels_[phasei];
movingPhasei += !phase.stationary();
stationaryPhasei += phase.stationary();
anisothermalPhasei += !phase.isothermal();
multiComponentPhasei += !phase.pure();
multicomponentPhasei += !phase.pure();
}
movingPhaseModels_.resize(movingPhasei);
stationaryPhaseModels_.resize(stationaryPhasei);
anisothermalPhaseModels_.resize(anisothermalPhasei);
multiComponentPhaseModels_.resize(multiComponentPhasei);
multicomponentPhaseModels_.resize(multicomponentPhasei);
movingPhasei = 0;
stationaryPhasei = 0;
anisothermalPhasei = 0;
multiComponentPhasei = 0;
multicomponentPhasei = 0;
forAll(phaseModels_, phasei)
{
phaseModel& phase = phaseModels_[phasei];
@ -296,7 +296,7 @@ Foam::phaseSystem::phaseSystem
}
if (!phase.pure())
{
multiComponentPhaseModels_.set(multiComponentPhasei++, &phase);
multicomponentPhaseModels_.set(multicomponentPhasei++, &phase);
}
}

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

@ -143,7 +143,7 @@ protected:
phaseModelPartialList anisothermalPhaseModels_;
//- Multi-component phase models
phaseModelPartialList multiComponentPhaseModels_;
phaseModelPartialList multicomponentPhaseModels_;
//- Total volumetric flux
surfaceScalarField phi_;
@ -302,10 +302,10 @@ public:
inline phaseModelPartialList& anisothermalPhases();
//- Return the models for phases that have multiple species
inline const phaseModelPartialList& multiComponentPhases() const;
inline const phaseModelPartialList& multicomponentPhases() const;
//- Access the models for phases that have multiple species
inline phaseModelPartialList& multiComponentPhases();
inline phaseModelPartialList& multicomponentPhases();
//- Return the phase not given as an argument in a two-phase system
// An error is generated if the system is not two-phase

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

@ -88,16 +88,16 @@ Foam::phaseSystem::anisothermalPhases()
inline const Foam::phaseSystem::phaseModelPartialList&
Foam::phaseSystem::multiComponentPhases() const
Foam::phaseSystem::multicomponentPhases() const
{
return multiComponentPhaseModels_;
return multicomponentPhaseModels_;
}
inline Foam::phaseSystem::phaseModelPartialList&
Foam::phaseSystem::multiComponentPhases()
Foam::phaseSystem::multicomponentPhases()
{
return multiComponentPhaseModels_;
return multicomponentPhaseModels_;
}

8
etc/codeTemplates/dynamicCode/fluidMulticomponentThermo
View File

@ -36,15 +36,15 @@ energy
mixture
(
pureMixture
multiComponentMixture
valueMultiComponentMixture
coefficientWilkeMultiComponentMixture
multicomponentMixture
valueMulticomponentMixture
coefficientWilkeMulticomponentMixture
);
mixtureRenamed
(
pureMixture singleComponentMixture
multiComponentMixture coefficientMultiComponentMixture
multicomponentMixture coefficientMulticomponentMixture
);
transport

17
src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,6 +29,15 @@ License
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
// Convert multiComponent -> multicomponent for backward-compatibility
inline Foam::word mixtureName(const Foam::dictionary& thermoTypeDict)
{
return
thermoTypeDict.lookup<Foam::word>("mixture")
.replace("multiComponent", "multicomponent");
}
template<class Thermo, class Table>
typename Table::iterator Foam::basicThermo::lookupCstrIter
(
@ -57,7 +66,7 @@ typename Table::iterator Foam::basicThermo::lookupCstrIter
List<Pair<word>>
{
{"type", thermoTypeDict.lookup("type")},
{"mixture", thermoTypeDict.lookup("mixture")},
{"mixture", mixtureName(thermoTypeDict)},
{"transport", thermoTypeDict.lookup("transport")},
{"thermo", thermoTypeDict.lookup("thermo")},
{
@ -161,7 +170,7 @@ typename Table::iterator Foam::basicThermo::lookupCstrIter
const word thermoTypeName
(
word(thermoTypeDict.lookup("type")) + '<'
+ word(thermoTypeDict.lookup("mixture")) + '<'
+ word(mixtureName(thermoTypeDict)) + '<'
+ word(thermoTypeDict.lookup("properties")) + ','
+ word(thermoTypeDict.lookup("energy")) + ">>"
);
@ -193,7 +202,7 @@ typename Table::iterator Foam::basicThermo::lookupCstrIter
const word thermoTypeName
(
word(thermoTypeDict.lookup("type")) + '<'
+ word(thermoTypeDict.lookup("mixture")) + '<'
+ word(mixtureName(thermoTypeDict)) + '<'
+ word(thermoTypeDict.lookup("transport")) + '<'
+ word(thermoTypeDict.lookup("thermo")) + '<'
+ word(thermoTypeDict.lookup("equationOfState")) + '<'

2
src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C
View File

@ -45,7 +45,7 @@ Foam::chemistryModel<ThermoType>::chemistryModel
? jacobianTypeNames_.read(this->lookup("jacobian"))
: jacobianType::fast
),
mixture_(refCast<const multiComponentMixture<ThermoType>>(this->thermo())),
mixture_(refCast<const multicomponentMixture<ThermoType>>(this->thermo())),
specieThermos_(mixture_.specieThermos()),
reactions_(mixture_.species(), specieThermos_, this->mesh(), *this),
RR_(nSpecie_),

6
src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.H
View File

@ -70,7 +70,7 @@ SourceFiles
#include "ReactionList.H"
#include "ODESystem.H"
#include "volFields.H"
#include "multiComponentMixture.H"
#include "multicomponentMixture.H"
#include "chemistryReductionMethod.H"
#include "chemistryTabulationMethod.H"
#include "DynamicField.H"
@ -135,7 +135,7 @@ class chemistryModel
const jacobianType jacobianType_;
//- Reference to the multi component mixture
const multiComponentMixture<ThermoType>& mixture_;
const multicomponentMixture<ThermoType>& mixture_;
//- Thermodynamic data of the species
const PtrList<ThermoType>& specieThermos_;
@ -215,7 +215,7 @@ public:
// Member Functions
//- Return reference to the mixture
inline const multiComponentMixture<ThermoType>& mixture() const;
inline const multicomponentMixture<ThermoType>& mixture() const;
//- The reactions
inline const PtrList<Reaction<ThermoType>>& reactions() const;

2
src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModelI.H
View File

@ -34,7 +34,7 @@ Foam::chemistryModel<ThermoType>::RR()
template<class ThermoType>
inline const Foam::multiComponentMixture<ThermoType>&
inline const Foam::multicomponentMixture<ThermoType>&
Foam::chemistryModel<ThermoType>::mixture() const
{
return mixture_;

16
src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.C → src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMulticomponentMixture/coefficientMulticomponentMixture.C
View File

@ -23,20 +23,20 @@ License
\*---------------------------------------------------------------------------*/
#include "coefficientMultiComponentMixture.H"
#include "coefficientMulticomponentMixture.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ThermoType>
Foam::coefficientMultiComponentMixture<ThermoType>::
coefficientMultiComponentMixture
Foam::coefficientMulticomponentMixture<ThermoType>::
coefficientMulticomponentMixture
(
const dictionary& thermoDict,
const fvMesh& mesh,
const word& phaseName
)
:
multiComponentMixture<ThermoType>
multicomponentMixture<ThermoType>
(
thermoDict,
mesh,
@ -50,8 +50,8 @@ coefficientMultiComponentMixture
template<class ThermoType>
const typename
Foam::coefficientMultiComponentMixture<ThermoType>::thermoMixtureType&
Foam::coefficientMultiComponentMixture<ThermoType>::cellThermoMixture
Foam::coefficientMulticomponentMixture<ThermoType>::thermoMixtureType&
Foam::coefficientMulticomponentMixture<ThermoType>::cellThermoMixture
(
const label celli
) const
@ -69,8 +69,8 @@ Foam::coefficientMultiComponentMixture<ThermoType>::cellThermoMixture
template<class ThermoType>
const typename
Foam::coefficientMultiComponentMixture<ThermoType>::thermoMixtureType&
Foam::coefficientMultiComponentMixture<ThermoType>::patchFaceThermoMixture
Foam::coefficientMulticomponentMixture<ThermoType>::thermoMixtureType&
Foam::coefficientMulticomponentMixture<ThermoType>::patchFaceThermoMixture
(
const label patchi,
const label facei

28
src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMultiComponentMixture/coefficientMultiComponentMixture.H → src/thermophysicalModels/multicomponentThermo/mixtures/coefficientMulticomponentMixture/coefficientMulticomponentMixture.H
View File

@ -22,21 +22,21 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::coefficientMultiComponentMixture
Foam::coefficientMulticomponentMixture
Description
Thermophysical properties mixing class which applies mass-fraction weighted
mixing to the thermodynamic and transport coefficients.
SourceFiles
coefficientMultiComponentMixture.C
coefficientMulticomponentMixture.C
\*---------------------------------------------------------------------------*/
#ifndef coefficientMultiComponentMixture_H
#define coefficientMultiComponentMixture_H
#ifndef coefficientMulticomponentMixture_H
#define coefficientMulticomponentMixture_H
#include "multiComponentMixture.H"
#include "multicomponentMixture.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,13 +44,13 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class coefficientMultiComponentMixture Declaration
Class coefficientMulticomponentMixture Declaration
\*---------------------------------------------------------------------------*/
template<class ThermoType>
class coefficientMultiComponentMixture
class coefficientMulticomponentMixture
:
public multiComponentMixture<ThermoType>
public multicomponentMixture<ThermoType>
{
public:
@ -75,7 +75,7 @@ public:
// Constructors
//- Construct from dictionary, mesh and phase name
coefficientMultiComponentMixture
coefficientMulticomponentMixture
(
const dictionary&,
const fvMesh&,
@ -83,14 +83,14 @@ public:
);
//- Disallow default bitwise copy construction
coefficientMultiComponentMixture
coefficientMulticomponentMixture
(
const coefficientMultiComponentMixture<ThermoType>&
const coefficientMulticomponentMixture<ThermoType>&
) = delete;
//- Destructor
virtual ~coefficientMultiComponentMixture()
virtual ~coefficientMulticomponentMixture()
{}
@ -99,7 +99,7 @@ public:
//- Return the instantiated type name
static word typeName()
{
return "multiComponentMixture<" + ThermoType::typeName() + '>';
return "multicomponentMixture<" + ThermoType::typeName() + '>';
}
const thermoMixtureType& cellThermoMixture(const label celli) const;
@ -155,7 +155,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "coefficientMultiComponentMixture.C"
#include "coefficientMulticomponentMixture.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

40
src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.C → src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMulticomponentMixture/coefficientWilkeMulticomponentMixture.C
View File

@ -23,20 +23,20 @@ License
\*---------------------------------------------------------------------------*/
#include "coefficientWilkeMultiComponentMixture.H"
#include "coefficientWilkeMulticomponentMixture.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ThermoType>
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::
coefficientWilkeMultiComponentMixture
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::
coefficientWilkeMulticomponentMixture
(
const dictionary& thermoDict,
const fvMesh& mesh,
const word& phaseName
)
:
multiComponentMixture<ThermoType>
multicomponentMixture<ThermoType>
(
thermoDict,
mesh,
@ -48,7 +48,7 @@ coefficientWilkeMultiComponentMixture
template<class ThermoType>
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::transportMixture::
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::transportMixture::
transportMixture
(
const PtrList<ThermoType>& specieThermos
@ -85,7 +85,7 @@ transportMixture
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ThermoType>
void Foam::coefficientWilkeMultiComponentMixture<ThermoType>::transportMixture::
void Foam::coefficientWilkeMulticomponentMixture<ThermoType>::transportMixture::
WilkeWeights
(
scalar p,
@ -123,7 +123,7 @@ WilkeWeights
template<class ThermoType>
Foam::scalar
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::transportMixture::
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::transportMixture::
mu
(
scalar p,
@ -144,7 +144,7 @@ mu
template<class ThermoType>
Foam::scalar
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::transportMixture::
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::transportMixture::
kappa
(
scalar p,
@ -168,8 +168,8 @@ kappa
template<class ThermoType>
const typename
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::thermoMixtureType&
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::cellThermoMixture
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::thermoMixtureType&
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::cellThermoMixture
(
const label celli
) const
@ -187,8 +187,8 @@ Foam::coefficientWilkeMultiComponentMixture<ThermoType>::cellThermoMixture
template<class ThermoType>
const typename
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::thermoMixtureType&
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::patchFaceThermoMixture
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::thermoMixtureType&
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::patchFaceThermoMixture
(
const label patchi,
const label facei
@ -211,8 +211,8 @@ Foam::coefficientWilkeMultiComponentMixture<ThermoType>::patchFaceThermoMixture
template<class ThermoType>
const typename
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::transportMixtureType&
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::cellTransportMixture
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::transportMixtureType&
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::cellTransportMixture
(
const label celli
) const
@ -240,8 +240,8 @@ Foam::coefficientWilkeMultiComponentMixture<ThermoType>::cellTransportMixture
template<class ThermoType>
const typename
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::transportMixtureType&
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::transportMixtureType&
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::
patchFaceTransportMixture
(
const label patchi,
@ -272,8 +272,8 @@ patchFaceTransportMixture
template<class ThermoType>
const typename
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::transportMixtureType&
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::transportMixtureType&
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::
cellTransportMixture
(
const label celli,
@ -288,8 +288,8 @@ cellTransportMixture
template<class ThermoType>
const typename
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::transportMixtureType&
Foam::coefficientWilkeMultiComponentMixture<ThermoType>::
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::transportMixtureType&
Foam::coefficientWilkeMulticomponentMixture<ThermoType>::
patchFaceTransportMixture
(
const label patchi,

30
src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMultiComponentMixture/coefficientWilkeMultiComponentMixture.H → src/thermophysicalModels/multicomponentThermo/mixtures/coefficientWilkeMulticomponentMixture/coefficientWilkeMulticomponentMixture.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::coefficientWilkeMultiComponentMixture
Foam::coefficientWilkeMulticomponentMixture
Description
Thermophysical properties mixing class which applies mass-fraction weighted
@ -37,14 +37,14 @@ Description
\endverbatim
SourceFiles
coefficientWilkeMultiComponentMixture.C
coefficientWilkeMulticomponentMixture.C
\*---------------------------------------------------------------------------*/
#ifndef coefficientWilkeMultiComponentMixture_H
#define coefficientWilkeMultiComponentMixture_H
#ifndef coefficientWilkeMulticomponentMixture_H
#define coefficientWilkeMulticomponentMixture_H
#include "multiComponentMixture.H"
#include "multicomponentMixture.H"
#include "scalarMatrices.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -53,13 +53,13 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class coefficientWilkeMultiComponentMixture Declaration
Class coefficientWilkeMulticomponentMixture Declaration
\*---------------------------------------------------------------------------*/
template<class ThermoType>
class coefficientWilkeMultiComponentMixture
class coefficientWilkeMulticomponentMixture
:
public multiComponentMixture<ThermoType>
public multicomponentMixture<ThermoType>
{
public:
@ -96,7 +96,7 @@ public:
public:
friend class coefficientWilkeMultiComponentMixture;
friend class coefficientWilkeMulticomponentMixture;
// Constructors
@ -141,7 +141,7 @@ public:
// Constructors
//- Construct from dictionary, mesh and phase name
coefficientWilkeMultiComponentMixture
coefficientWilkeMulticomponentMixture
(
const dictionary&,
const fvMesh&,
@ -149,14 +149,14 @@ public:
);
//- Disallow default bitwise copy construction
coefficientWilkeMultiComponentMixture
coefficientWilkeMulticomponentMixture
(
const coefficientWilkeMultiComponentMixture<ThermoType>&
const coefficientWilkeMulticomponentMixture<ThermoType>&
) = delete;
//- Destructor
virtual ~coefficientWilkeMultiComponentMixture()
virtual ~coefficientWilkeMulticomponentMixture()
{}
@ -166,7 +166,7 @@ public:
static word typeName()
{
return
"coefficientWilkeMultiComponentMixture<"
"coefficientWilkeMulticomponentMixture<"
+ ThermoType::typeName() + '>';
}
@ -211,7 +211,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "coefficientWilkeMultiComponentMixture.C"
#include "coefficientWilkeMulticomponentMixture.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
src/thermophysicalModels/multicomponentThermo/mixtures/multiComponentMixture/multiComponentMixture.C → src/thermophysicalModels/multicomponentThermo/mixtures/multicomponentMixture/multicomponentMixture.C
View File

@ -23,13 +23,13 @@ License
\*---------------------------------------------------------------------------*/
#include "multiComponentMixture.H"
#include "multicomponentMixture.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class ThermoType>
Foam::PtrList<ThermoType>
Foam::multiComponentMixture<ThermoType>::readSpeciesData
Foam::multicomponentMixture<ThermoType>::readSpeciesData
(
const dictionary& thermoDict
) const
@ -51,7 +51,7 @@ Foam::multiComponentMixture<ThermoType>::readSpeciesData
template<class ThermoType>
Foam::List<Foam::List<Foam::specieElement>>
Foam::multiComponentMixture<ThermoType>::readSpeciesComposition
Foam::multicomponentMixture<ThermoType>::readSpeciesComposition
(
const dictionary& thermoDict
) const
@ -87,7 +87,7 @@ Foam::multiComponentMixture<ThermoType>::readSpeciesComposition
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ThermoType>
Foam::multiComponentMixture<ThermoType>::multiComponentMixture
Foam::multicomponentMixture<ThermoType>::multicomponentMixture
(
const dictionary& thermoDict,
const fvMesh& mesh,
@ -111,7 +111,7 @@ Foam::multiComponentMixture<ThermoType>::multiComponentMixture
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ThermoType>
void Foam::multiComponentMixture<ThermoType>::read
void Foam::multicomponentMixture<ThermoType>::read
(
const dictionary& thermoDict
)
@ -123,7 +123,7 @@ void Foam::multiComponentMixture<ThermoType>::read
template<class ThermoType>
const Foam::List<Foam::specieElement>&
Foam::multiComponentMixture<ThermoType>::specieComposition
Foam::multicomponentMixture<ThermoType>::specieComposition
(
const label speciei
) const

24
src/thermophysicalModels/multicomponentThermo/mixtures/multiComponentMixture/multiComponentMixture.H → src/thermophysicalModels/multicomponentThermo/mixtures/multicomponentMixture/multicomponentMixture.H
View File

@ -22,18 +22,18 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::multiComponentMixture
Foam::multicomponentMixture
Description
Foam::multiComponentMixture
Foam::multicomponentMixture
SourceFiles
multiComponentMixture.C
multicomponentMixture.C
\*---------------------------------------------------------------------------*/
#ifndef multiComponentMixture_H
#define multiComponentMixture_H
#ifndef multicomponentMixture_H
#define multicomponentMixture_H
#include "basicSpecieMixture.H"
#include "HashPtrTable.H"
@ -45,11 +45,11 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class multiComponentMixture Declaration
Class multicomponentMixture Declaration
\*---------------------------------------------------------------------------*/
template<class ThermoType>
class multiComponentMixture
class multicomponentMixture
:
public basicSpecieMixture
{
@ -88,17 +88,17 @@ public:
// Constructors
//- Construct from dictionary, mesh and phase name
multiComponentMixture(const dictionary&, const fvMesh&, const word&);
multicomponentMixture(const dictionary&, const fvMesh&, const word&);
//- Disallow default bitwise copy construction
multiComponentMixture
multicomponentMixture
(
const multiComponentMixture<ThermoType>&
const multicomponentMixture<ThermoType>&
) = delete;
//- Destructor
virtual ~multiComponentMixture()
virtual ~multicomponentMixture()
{}
@ -134,7 +134,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "multiComponentMixture.C"
#include "multicomponentMixture.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

46
src/thermophysicalModels/multicomponentThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.C → src/thermophysicalModels/multicomponentThermo/mixtures/valueMulticomponentMixture/valueMulticomponentMixture.C
View File

@ -23,19 +23,19 @@ License
\*---------------------------------------------------------------------------*/
#include "valueMultiComponentMixture.H"
#include "valueMulticomponentMixture.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ThermoType>
Foam::valueMultiComponentMixture<ThermoType>::valueMultiComponentMixture
Foam::valueMulticomponentMixture<ThermoType>::valueMulticomponentMixture
(
const dictionary& thermoDict,
const fvMesh& mesh,
const word& phaseName
)
:
multiComponentMixture<ThermoType>
multicomponentMixture<ThermoType>
(
thermoDict,
mesh,
@ -50,7 +50,7 @@ Foam::valueMultiComponentMixture<ThermoType>::valueMultiComponentMixture
template<class ThermoType>
Foam::scalar
Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::limit
Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::limit
(
const scalar T
) const
@ -62,7 +62,7 @@ Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::limit
template<class ThermoType>
template<class Method, class ... Args>
Foam::scalar
Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::massWeighted
Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::massWeighted
(
Method psiMethod,
const Args& ... args
@ -82,7 +82,7 @@ Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::massWeighted
template<class ThermoType>
template<class Method, class ... Args>
Foam::scalar
Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::
Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::
harmonicMassWeighted
(
Method psiMethod,
@ -103,7 +103,7 @@ harmonicMassWeighted
template<class ThermoType>
template<class Method, class ... Args>
Foam::scalar
Foam::valueMultiComponentMixture<ThermoType>::transportMixture::moleWeighted
Foam::valueMulticomponentMixture<ThermoType>::transportMixture::moleWeighted
(
Method psiMethod,
const Args& ... args
@ -121,7 +121,7 @@ Foam::valueMultiComponentMixture<ThermoType>::transportMixture::moleWeighted
template<class ThermoType>
Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::W
Foam::scalar Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::W
() const
{
return harmonicMassWeighted(&ThermoType::W);
@ -129,7 +129,7 @@ Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::W
template<class ThermoType>
Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::rho
Foam::scalar Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::rho
(
scalar p,
scalar T
@ -140,7 +140,7 @@ Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::rho
template<class ThermoType>
Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::psi
Foam::scalar Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::psi
(
scalar p,
scalar T
@ -167,7 +167,7 @@ Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::psi
template<class ThermoType>
Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::Hf
Foam::scalar Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::Hf
() const
{
return massWeighted(&ThermoType::Hf);
@ -177,7 +177,7 @@ Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::Hf
#define thermoMixtureFunction(Func) \
template<class ThermoType> \
Foam::scalar \
Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::Func \
Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::Func \
( \
scalar p, \
scalar T \
@ -196,7 +196,7 @@ thermoMixtureFunction(HE)
template<class ThermoType>
Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::THE
Foam::scalar Foam::valueMulticomponentMixture<ThermoType>::thermoMixture::THE
(
const scalar he,
scalar p,
@ -218,7 +218,7 @@ Foam::scalar Foam::valueMultiComponentMixture<ThermoType>::thermoMixture::THE
template<class ThermoType>
Foam::scalar
Foam::valueMultiComponentMixture<ThermoType>::transportMixture::mu
Foam::valueMulticomponentMixture<ThermoType>::transportMixture::mu
(
scalar p,
scalar T
@ -230,7 +230,7 @@ Foam::valueMultiComponentMixture<ThermoType>::transportMixture::mu
template<class ThermoType>
Foam::scalar
Foam::valueMultiComponentMixture<ThermoType>::transportMixture::kappa
Foam::valueMulticomponentMixture<ThermoType>::transportMixture::kappa
(
scalar p,
scalar T
@ -242,8 +242,8 @@ Foam::valueMultiComponentMixture<ThermoType>::transportMixture::kappa
template<class ThermoType>
const typename
Foam::valueMultiComponentMixture<ThermoType>::thermoMixtureType&
Foam::valueMultiComponentMixture<ThermoType>::cellThermoMixture
Foam::valueMulticomponentMixture<ThermoType>::thermoMixtureType&
Foam::valueMulticomponentMixture<ThermoType>::cellThermoMixture
(
const label celli
) const
@ -261,8 +261,8 @@ Foam::valueMultiComponentMixture<ThermoType>::cellThermoMixture
template<class ThermoType>
const typename
Foam::valueMultiComponentMixture<ThermoType>::thermoMixtureType&
Foam::valueMultiComponentMixture<ThermoType>::patchFaceThermoMixture
Foam::valueMulticomponentMixture<ThermoType>::thermoMixtureType&
Foam::valueMulticomponentMixture<ThermoType>::patchFaceThermoMixture
(
const label patchi,
const label facei
@ -281,8 +281,8 @@ Foam::valueMultiComponentMixture<ThermoType>::patchFaceThermoMixture
template<class ThermoType>
const typename
Foam::valueMultiComponentMixture<ThermoType>::transportMixtureType&
Foam::valueMultiComponentMixture<ThermoType>::cellTransportMixture
Foam::valueMulticomponentMixture<ThermoType>::transportMixtureType&
Foam::valueMulticomponentMixture<ThermoType>::cellTransportMixture
(
const label celli
) const
@ -308,8 +308,8 @@ Foam::valueMultiComponentMixture<ThermoType>::cellTransportMixture
template<class ThermoType>
const typename
Foam::valueMultiComponentMixture<ThermoType>::transportMixtureType&
Foam::valueMultiComponentMixture<ThermoType>::patchFaceTransportMixture
Foam::valueMulticomponentMixture<ThermoType>::transportMixtureType&
Foam::valueMulticomponentMixture<ThermoType>::patchFaceTransportMixture
(
const label patchi,
const label facei

32
src/thermophysicalModels/multicomponentThermo/mixtures/valueMultiComponentMixture/valueMultiComponentMixture.H → src/thermophysicalModels/multicomponentThermo/mixtures/valueMulticomponentMixture/valueMulticomponentMixture.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::valueMultiComponentMixture
Foam::valueMulticomponentMixture
Description
Thermophysical properties mixing class which applies mass-fraction weighted
@ -30,14 +30,14 @@ Description
transport properties.
SourceFiles
valueMultiComponentMixture.C
valueMulticomponentMixture.C
\*---------------------------------------------------------------------------*/
#ifndef valueMultiComponentMixture_H
#define valueMultiComponentMixture_H
#ifndef valueMulticomponentMixture_H
#define valueMulticomponentMixture_H
#include "multiComponentMixture.H"
#include "multicomponentMixture.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -45,13 +45,13 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class valueMultiComponentMixture Declaration
Class valueMulticomponentMixture Declaration
\*---------------------------------------------------------------------------*/
template<class ThermoType>
class valueMultiComponentMixture
class valueMulticomponentMixture
:
public multiComponentMixture<ThermoType>
public multicomponentMixture<ThermoType>
{
public:
@ -79,7 +79,7 @@ public:
public:
friend class valueMultiComponentMixture;
friend class valueMulticomponentMixture;
// Constructors
@ -159,7 +159,7 @@ public:
public:
friend class valueMultiComponentMixture;
friend class valueMulticomponentMixture;
transportMixture
(
@ -204,7 +204,7 @@ public:
// Constructors
//- Construct from dictionary, mesh and phase name
valueMultiComponentMixture
valueMulticomponentMixture
(
const dictionary&,
const fvMesh&,
@ -212,14 +212,14 @@ public:
);
//- Disallow default bitwise copy construction
valueMultiComponentMixture
valueMulticomponentMixture
(
const valueMultiComponentMixture<ThermoType>&
const valueMulticomponentMixture<ThermoType>&
) = delete;
//- Destructor
virtual ~valueMultiComponentMixture()
virtual ~valueMulticomponentMixture()
{}
@ -229,7 +229,7 @@ public:
static word typeName()
{
return
"valueMultiComponentMixture<" + ThermoType::typeName() + '>';
"valueMulticomponentMixture<" + ThermoType::typeName() + '>';
}
const thermoMixtureType& cellThermoMixture(const label celli) const;
@ -279,7 +279,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "valueMultiComponentMixture.C"
#include "valueMulticomponentMixture.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C
View File

@ -23,8 +23,8 @@ License
\*---------------------------------------------------------------------------*/
#include "coefficientMultiComponentMixture.H"
#include "coefficientWilkeMultiComponentMixture.H"
#include "coefficientMulticomponentMixture.H"
#include "coefficientWilkeMulticomponentMixture.H"
#include "singleComponentMixture.H"
#include "psiThermo.H"
@ -62,13 +62,13 @@ namespace Foam
forCoeffGases
(
makePsiMulticomponentThermos,
coefficientMultiComponentMixture
coefficientMulticomponentMixture
);
forCoeffGases
(
makePsiMulticomponentThermos,
coefficientWilkeMultiComponentMixture
coefficientWilkeMulticomponentMixture
);
forGases(makePsiMulticomponentThermo, singleComponentMixture);

16
src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C
View File

@ -23,9 +23,9 @@ License
\*---------------------------------------------------------------------------*/
#include "coefficientMultiComponentMixture.H"
#include "coefficientWilkeMultiComponentMixture.H"
#include "valueMultiComponentMixture.H"
#include "coefficientMulticomponentMixture.H"
#include "coefficientWilkeMulticomponentMixture.H"
#include "valueMulticomponentMixture.H"
#include "singleComponentMixture.H"
#include "rhoThermo.H"
@ -65,13 +65,13 @@ namespace Foam
forCoeffGases
(
makeRhoMulticomponentThermos,
coefficientMultiComponentMixture
coefficientMulticomponentMixture
);
forCoeffGases
(
makeRhoMulticomponentThermos,
coefficientWilkeMultiComponentMixture
coefficientWilkeMulticomponentMixture
);
forGases(makeRhoMulticomponentThermo, singleComponentMixture);
@ -79,12 +79,12 @@ namespace Foam
forCoeffLiquids
(
makeRhoMulticomponentThermos,
coefficientMultiComponentMixture
coefficientMulticomponentMixture
);
forLiquids(makeRhoMulticomponentThermos, valueMultiComponentMixture);
forLiquids(makeRhoMulticomponentThermos, valueMulticomponentMixture);
forLiquids(makeRhoMulticomponentThermo, singleComponentMixture);
forTabulated(makeRhoMulticomponentThermos, valueMultiComponentMixture);
forTabulated(makeRhoMulticomponentThermos, valueMulticomponentMixture);
forTabulated(makeRhoMulticomponentThermo, singleComponentMixture);
}

4
test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties
View File

@ -22,7 +22,7 @@ nInterfaceCorrectors 1;
gas
{
type multiComponentPhaseModel;
type multicomponentPhaseModel;
diameterModel none;
residualAlpha 1e-6;
Sct 0.7;
@ -30,7 +30,7 @@ gas
liquid
{
type multiComponentPhaseModel;
type multicomponentPhaseModel;
diameterModel constant;
d 5e-4;
residualAlpha 1e-6;

2
test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/physicalProperties.gas.orig
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
equationOfState perfectGas;

2
test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/physicalProperties.liquid.orig
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport const;
thermo eConst;
equationOfState rhoConst;

2
test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties
View File

@ -22,7 +22,7 @@ nInterfaceCorrectors 1;
gas
{
type multiComponentPhaseModel;
type multicomponentPhaseModel;
diameterModel none;
residualAlpha 1e-6;
Sct 0.7;

2
test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/physicalProperties.gas.orig
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
equationOfState perfectGas;

2
tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/chemFoam/gri/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/chemFoam/h2/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/chemFoam/ic8h18/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/chemFoam/ic8h18_TDAC/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/chemFoam/nc7h16/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/Lagrangian/filter/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/physicalProperties
View File

@ -18,7 +18,7 @@ thermoType
{
type hePsiThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/RAS/membrane/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture coefficientWilkeMultiComponentMixture;
mixture coefficientWilkeMulticomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture coefficientWilkeMultiComponentMixture;
mixture coefficientWilkeMulticomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type hePsiThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
energy sensibleEnthalpy;

2
tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/physicalProperties
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
equationOfState perfectGas;

2
tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/physicalProperties.gas
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
equationOfState perfectGas;

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

@ -20,7 +20,7 @@ phases (gas liquid);
gas
{
type multiComponentPhaseModel;
type multicomponentPhaseModel;
diameterModel isothermal;
isothermalCoeffs
{

2
tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/physicalProperties.gas
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
equationOfState perfectGas;

4
tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties
View File

@ -20,7 +20,7 @@ phases (gas liquid);
gas
{
type multiComponentPhaseModel;
type multicomponentPhaseModel;
diameterModel isothermal;
isothermalCoeffs
{
@ -33,7 +33,7 @@ gas
liquid
{
type multiComponentPhaseModel;
type multicomponentPhaseModel;
diameterModel constant;
constantCoeffs
{

2
tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/physicalProperties.gas
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport const;
thermo eConst;
equationOfState perfectGas;

2
tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/physicalProperties.liquid
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport const;
thermo eConst;
equationOfState rPolynomial;

2
tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties
View File

@ -22,7 +22,7 @@ populationBalances (aggregates);
particles
{
type multiComponentPhaseModel;
type multicomponentPhaseModel;
diameterModel velocityGroup;

2
tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/physicalProperties.particles
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport const;
thermo hConst;
equationOfState rhoConst;

2
tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/physicalProperties.vapor
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
equationOfState perfectGas;

2
tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties
View File

@ -22,7 +22,7 @@ populationBalances (aggregates);
particles
{
type multiComponentPhaseModel;
type multicomponentPhaseModel;
diameterModel velocityGroup;

2
tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/physicalProperties.particles
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport const;
thermo hConst;
equationOfState rhoConst;

2
tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/physicalProperties.vapor
View File

@ -17,7 +17,7 @@ FoamFile
thermoType
{
type heRhoThermo;
mixture multiComponentMixture;
mixture multicomponentMixture;
transport sutherland;
thermo janaf;
equationOfState perfectGas;