From 30c877a7abe0abed67a9b2272850f9eb8b718e90 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 13 Jan 2022 09:19:38 +0000 Subject: [PATCH] multiphaseEulerFoam: Use phaseSystem::propertiesName --- .../functionObjects/phaseForces/phaseForces.C | 2 +- .../functionObjects/phaseMap/phaseMap.C | 7 +++++-- .../JohnsonJacksonParticleSlipFvPatchVectorField.C | 4 ++-- .../JohnsonJacksonParticleThetaFvPatchScalarField.C | 4 ++-- .../alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C | 2 +- .../alphatWallBoilingWallFunctionFvPatchScalarField.C | 2 +- .../fixedMultiPhaseHeatFluxFvPatchScalarField.C | 6 ++---- .../phaseSystems/phaseSystem/phaseSystem.C | 4 ++-- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C index 90cfbc9d47..5aa0571eca 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C @@ -82,7 +82,7 @@ Foam::functionObjects::phaseForces::phaseForces IOobject::groupName("alpha", dict.lookup("phase")) ) ), - fluid_(mesh_.lookupObject("phaseProperties")) + fluid_(mesh_.lookupObject(phaseSystem::propertiesName)) { read(dict); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C index f21bcaa1dd..5567d3c5da 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,10 @@ Foam::functionObjects::phaseMap::phaseMap ) : fvMeshFunctionObject(name, runTime, dict), - phases_(mesh_.lookupObject("phaseProperties").phases()) + phases_ + ( + mesh_.lookupObject(phaseSystem::propertiesName).phases() + ) {} diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C index 1ad1f84cbe..31a0a70328 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -143,7 +143,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs() // lookup the fluid model and the phase const phaseSystem& fluid = - db().lookupObject("phaseProperties"); + db().lookupObject(phaseSystem::propertiesName); const phaseModel& phase ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C index 9127e13cc3..ec376283a7 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -163,7 +163,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs() // lookup the fluid model and the phase const phaseSystem& fluid = - db().lookupObject("phaseProperties"); + db().lookupObject(phaseSystem::propertiesName); const phaseModel& phase ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C index 5c64356994..be47607992 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C @@ -159,7 +159,7 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat { // Lookup the fluid model const phaseSystem& fluid = - db().lookupObject("phaseProperties"); + db().lookupObject(phaseSystem::propertiesName); const phaseModel& phase ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index 3e5952d0d7..8344d40cee 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C @@ -283,7 +283,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs() // Lookup the fluid model const phaseSystem& fluid = - db().lookupObject("phaseProperties"); + db().lookupObject(phaseSystem::propertiesName); const word volatileSpecie(fluid.lookupOrDefault("volatile", "none")); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C index da800679b6..644440cfd9 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,9 +104,7 @@ void Foam::fixedMultiPhaseHeatFluxFvPatchScalarField::updateCoeffs() // Lookup the fluid model const phaseSystem& fluid = - ( - db().lookupObject("phaseProperties") - ); + db().lookupObject(phaseSystem::propertiesName); const scalarField& Tp = *this; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C index da59c2aab0..26bc25a1b1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -368,7 +368,7 @@ Foam::phaseSystem::phaseSystem ( IOobject ( - "phaseProperties", + propertiesName, mesh.time().constant(), mesh, IOobject::MUST_READ_IF_MODIFIED,