From 88585af6af8daa37ae2a78cdfdf22e364e6fc196 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 12 Aug 2021 10:26:23 +0100 Subject: [PATCH] multiphaseEulerFoam: nucleationModels: Moved velocityGroup member to base class Patch contributed by Institute of Fluid Dynamics, Helmholtz-Zentrum Dresden - Rossendorf (HZDR) --- .../nucleationModel/nucleationModel.C | 18 ++++++++++++++++-- .../nucleationModel/nucleationModel.H | 5 ++++- .../reactionDriven/reactionDriven.C | 14 -------------- .../reactionDriven/reactionDriven.H | 5 +---- .../nucleationModels/wallBoiling/wallBoiling.C | 16 +--------------- .../nucleationModels/wallBoiling/wallBoiling.H | 8 +------- 6 files changed, 23 insertions(+), 43 deletions(-) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C index d60cf2a137..174fea748d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,21 @@ Foam::diameterModels::nucleationModel::nucleationModel ) : popBal_(popBal), - dict_(dict) + dict_(dict), + velGroup_ + ( + refCast + ( + popBal.mesh().lookupObject + ( + IOobject::groupName + ( + "alpha", + dict.lookup("velocityGroup") + ) + ).dPtr()() + ) + ) {} diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H index 93cc0f4f6a..8c1dc90e4c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,6 +60,9 @@ protected: //- Model dictionary const dictionary dict_; + //- Velocity group in which the nucleation occurs + const velocityGroup& velGroup_; + public: diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C index db77555dd6..7c8ad5f9c0 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C @@ -63,20 +63,6 @@ reactionDriven : nucleationModel(popBal, dict), dNuc_("nucleationDiameter", dimLength, dict), - velGroup_ - ( - refCast - ( - popBal.mesh().lookupObject - ( - IOobject::groupName - ( - "alpha", - dict.lookup("velocityGroup") - ) - ).dPtr()() - ) - ), reactingPhase_ ( popBal_.mesh().lookupObject diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H index e325fc5bf9..0dabfa0807 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,9 +60,6 @@ class reactionDriven //- Sphere-equivalent nucleation diameter const dimensionedScalar dNuc_; - //- Velocity group in which the nucleation occurs - const velocityGroup& velGroup_; - //- Phase in which the reaction occurs const phaseModel& reactingPhase_; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C index 4ec4b5a505..0f788def13 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C @@ -57,21 +57,7 @@ wallBoiling const dictionary& dict ) : - nucleationModel(popBal, dict), - velGroup_ - ( - refCast - ( - popBal.mesh().lookupObject - ( - IOobject::groupName - ( - "alpha", - dict.lookup("velocityGroup") - ) - ).dPtr()() - ) - ) + nucleationModel(popBal, dict) {} diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H index 2c53c353f8..1c62f1bdb1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,12 +59,6 @@ class wallBoiling : public nucleationModel { - // Private Data - - //- Velocity group in which the nucleation occurs - const velocityGroup& velGroup_; - - public: //- Runtime type information