From a6c59e00b2fd805738fc8c9ee7b0c893f249b411 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Fri, 23 Jul 2021 16:19:30 +0100 Subject: [PATCH] multiphaseEulerFoam: Renamed CoulaloglouTavlaridesCoalescence to CoulaloglouTavlarides Patch contributed by Institute of Fluid Dynamics, Helmholtz-Zentrum Dresden - Rossendorf (HZDR) --- .../phaseSystems/Make/files | 2 +- .../CoulaloglouTavlarides.C} | 12 ++++++------ .../CoulaloglouTavlarides.H} | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) rename applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/{CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C => CoulaloglouTavlarides/CoulaloglouTavlarides.C} (89%) rename applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/{CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H => CoulaloglouTavlarides/CoulaloglouTavlarides.H} (91%) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/files b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/files index 725c0b53b9..df53b8f51f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/files +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/files @@ -47,7 +47,7 @@ $(coalescenceModels)/coalescenceModel/coalescenceModel.C $(coalescenceModels)/ballisticCollisions/ballisticCollisions.C $(coalescenceModels)/BrownianCollisions/BrownianCollisions.C $(coalescenceModels)/constantCoalescence/constantCoalescence.C -$(coalescenceModels)/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C +$(coalescenceModels)/CoulaloglouTavlarides/CoulaloglouTavlarides.C $(coalescenceModels)/DahnekeInterpolation/DahnekeInterpolation.C $(coalescenceModels)/hydrodynamic/hydrodynamic.C $(coalescenceModels)/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C similarity index 89% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C rename to applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C index 4b07150b4e..6a9f841e74 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "CoulaloglouTavlaridesCoalescence.H" +#include "CoulaloglouTavlarides.H" #include "addToRunTimeSelectionTable.H" #include "phaseDynamicMomentumTransportModel.H" @@ -35,11 +35,11 @@ namespace diameterModels { namespace coalescenceModels { - defineTypeNameAndDebug(CoulaloglouTavlaridesCoalescence, 0); + defineTypeNameAndDebug(CoulaloglouTavlarides, 0); addToRunTimeSelectionTable ( coalescenceModel, - CoulaloglouTavlaridesCoalescence, + CoulaloglouTavlarides, dictionary ); } @@ -49,8 +49,8 @@ namespace coalescenceModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::diameterModels::coalescenceModels::CoulaloglouTavlaridesCoalescence:: -CoulaloglouTavlaridesCoalescence +Foam::diameterModels::coalescenceModels::CoulaloglouTavlarides:: +CoulaloglouTavlarides ( const populationBalanceModel& popBal, const dictionary& dict @@ -65,7 +65,7 @@ CoulaloglouTavlaridesCoalescence // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void -Foam::diameterModels::coalescenceModels::CoulaloglouTavlaridesCoalescence:: +Foam::diameterModels::coalescenceModels::CoulaloglouTavlarides:: addToCoalescenceRate ( volScalarField& coalescenceRate, diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H similarity index 91% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H rename to applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H index 2103dc85bc..ff0e8c7330 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::diameterModels::coalescenceModels::CoulaloglouTavlaridesCoalescence + Foam::diameterModels::coalescenceModels::CoulaloglouTavlarides Description Model of Coulaloglou and Tavlarides (1977). The coalescence rate is @@ -70,12 +70,12 @@ Usage \endtable SourceFiles - CoulaloglouTavlaridesCoalescence.C + CoulaloglouTavlarides.C \*---------------------------------------------------------------------------*/ -#ifndef CoulaloglouTavlaridesCoalescence_H -#define CoulaloglouTavlaridesCoalescence_H +#ifndef CoulaloglouTavlarides_H +#define CoulaloglouTavlarides_H #include "coalescenceModel.H" @@ -89,10 +89,10 @@ namespace coalescenceModels { /*---------------------------------------------------------------------------*\ - Class CoulaloglouTavlaridesCoalescence Declaration + Class CoulaloglouTavlarides Declaration \*---------------------------------------------------------------------------*/ -class CoulaloglouTavlaridesCoalescence +class CoulaloglouTavlarides : public coalescenceModel { @@ -112,7 +112,7 @@ public: // Constructor - CoulaloglouTavlaridesCoalescence + CoulaloglouTavlarides ( const populationBalanceModel& popBal, const dictionary& dict @@ -120,7 +120,7 @@ public: //- Destructor - virtual ~CoulaloglouTavlaridesCoalescence() + virtual ~CoulaloglouTavlarides() {}