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

multiphaseEulerFoam: Use phaseSystem::propertiesName

Browse Source
This commit is contained in:
Will Bainbridge
2022-01-13 09:19:38 +00:00
parent b58e1f5d5a
commit 30c877a7ab
8 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C
View File

@ -82,7 +82,7 @@ Foam::functionObjects::phaseForces::phaseForces
IOobject::groupName("alpha", dict.lookup("phase")) IOobject::groupName("alpha", dict.lookup("phase"))
) )
), ),
fluid_(mesh_.lookupObject<phaseSystem>("phaseProperties")) fluid_(mesh_.lookupObject<phaseSystem>(phaseSystem::propertiesName))
{ {
read(dict); read(dict);

7
applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -48,7 +48,10 @@ Foam::functionObjects::phaseMap::phaseMap
) )
: :
fvMeshFunctionObject(name, runTime, dict), fvMeshFunctionObject(name, runTime, dict),
phases_(mesh_.lookupObject<phaseSystem>("phaseProperties").phases()) phases_
(
mesh_.lookupObject<phaseSystem>(phaseSystem::propertiesName).phases()
)
{} {}

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -143,7 +143,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
// lookup the fluid model and the phase // lookup the fluid model and the phase
const phaseSystem& fluid = const phaseSystem& fluid =
db().lookupObject<phaseSystem>("phaseProperties"); db().lookupObject<phaseSystem>(phaseSystem::propertiesName);
const phaseModel& phase const phaseModel& phase
( (

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -163,7 +163,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
// lookup the fluid model and the phase // lookup the fluid model and the phase
const phaseSystem& fluid = const phaseSystem& fluid =
db().lookupObject<phaseSystem>("phaseProperties"); db().lookupObject<phaseSystem>(phaseSystem::propertiesName);
const phaseModel& phase const phaseModel& phase
( (

2
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C
View File

@ -159,7 +159,7 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat
{ {
// Lookup the fluid model // Lookup the fluid model
const phaseSystem& fluid = const phaseSystem& fluid =
db().lookupObject<phaseSystem>("phaseProperties"); db().lookupObject<phaseSystem>(phaseSystem::propertiesName);
const phaseModel& phase const phaseModel& phase
( (

2
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
View File

@ -283,7 +283,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
// Lookup the fluid model // Lookup the fluid model
const phaseSystem& fluid = const phaseSystem& fluid =
db().lookupObject<phaseSystem>("phaseProperties"); db().lookupObject<phaseSystem>(phaseSystem::propertiesName);
const word volatileSpecie(fluid.lookupOrDefault<word>("volatile", "none")); const word volatileSpecie(fluid.lookupOrDefault<word>("volatile", "none"));

6
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -104,9 +104,7 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::updateCoeffs()
// Lookup the fluid model // Lookup the fluid model
const phaseSystem& fluid = const phaseSystem& fluid =
( db().lookupObject<phaseSystem>(phaseSystem::propertiesName);
db().lookupObject<phaseSystem>("phaseProperties")
);
const scalarField& Tp = *this; const scalarField& Tp = *this;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -368,7 +368,7 @@ Foam::phaseSystem::phaseSystem
( (
IOobject IOobject
( (
"phaseProperties", propertiesName,
mesh.time().constant(), mesh.time().constant(),
mesh, mesh,
IOobject::MUST_READ_IF_MODIFIED, IOobject::MUST_READ_IF_MODIFIED,