multiphaseEulerFoam: Renamed CoulaloglouTavlaridesCoalescence to CoulaloglouTavlarides

Patch contributed by Institute of Fluid Dynamics,
Helmholtz-Zentrum Dresden - Rossendorf (HZDR)

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

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::
+Foam::diameterModels::coalescenceModels::CoulaloglouTavlarides::
-CoulaloglouTavlaridesCoalescence
+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,

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 <http://www.gnu.org/licenses/>.
 
 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
+#ifndef CoulaloglouTavlarides_H
-#define CoulaloglouTavlaridesCoalescence_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()
     {}