multiphaseEulerFoam: Renamed Laakkonen et al models

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

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/files

@@ -64,12 +64,12 @@ $(binaryBreakupModels)/powerLawUniformBinary/powerLawUniformBinary.C
 breakupModels = populationBalanceModel/breakupModels
 $(breakupModels)/breakupModel/breakupModel.C
 $(breakupModels)/exponential/exponential.C
-$(breakupModels)/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C
+$(breakupModels)/Laakkonen/Laakkonen.C
 $(breakupModels)/powerLaw/powerLaw.C
 
 daughterSizeDistributionModels = populationBalanceModel/daughterSizeDistributionModels
 $(daughterSizeDistributionModels)/daughterSizeDistributionModel/daughterSizeDistributionModel.C
-$(daughterSizeDistributionModels)/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C
+$(daughterSizeDistributionModels)/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C
 $(daughterSizeDistributionModels)/uniformBinary/uniformBinary.C
 
 driftModels = populationBalanceModel/driftModels

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "LaakkonenAlopaeusAittamaa.H"
+#include "Laakkonen.H"
 #include "addToRunTimeSelectionTable.H"
 #include "phaseDynamicMomentumTransportModel.H"
 
@@ -35,11 +35,11 @@ namespace diameterModels
 {
 namespace breakupModels
 {
-    defineTypeNameAndDebug(LaakkonenAlopaeusAittamaa, 0);
+    defineTypeNameAndDebug(Laakkonen, 0);
     addToRunTimeSelectionTable
     (
         breakupModel,
-        LaakkonenAlopaeusAittamaa,
+        Laakkonen,
         dictionary
     );
 }
@@ -49,8 +49,8 @@ namespace breakupModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::diameterModels::breakupModels::LaakkonenAlopaeusAittamaa::
-LaakkonenAlopaeusAittamaa
+Foam::diameterModels::breakupModels::Laakkonen::
+Laakkonen
 (
     const populationBalanceModel& popBal,
     const dictionary& dict
@@ -75,7 +75,7 @@ LaakkonenAlopaeusAittamaa
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void
-Foam::diameterModels::breakupModels::LaakkonenAlopaeusAittamaa::setBreakupRate
+Foam::diameterModels::breakupModels::Laakkonen::setBreakupRate
 (
     volScalarField& breakupRate,
     const label i

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::diameterModels::breakupModels::LaakkonenAlopaeusAittamaa
+    Foam::diameterModels::breakupModels::Laakkonen
 
 Description
     Model of Laakkonen et al. (2007). The total breakup rate is calculated by
@@ -68,12 +68,12 @@ Usage
     \endtable
 
 SourceFiles
-    LaakkonenAlopaeusAittamaa.C
+    Laakkonen.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef LaakkonenAlopaeusAittamaa_H
-#define LaakkonenAlopaeusAittamaa_H
+#ifndef Laakkonen_H
+#define Laakkonen_H
 
 #include "breakupModel.H"
 
@@ -87,10 +87,10 @@ namespace breakupModels
 {
 
 /*---------------------------------------------------------------------------*\
-                  Class LaakkonenAlopaeusAittamaa Declaration
+                          Class Laakkonen Declaration
 \*---------------------------------------------------------------------------*/
 
-class LaakkonenAlopaeusAittamaa
+class Laakkonen
 :
     public breakupModel
 {
@@ -109,11 +109,11 @@ class LaakkonenAlopaeusAittamaa
 public:
 
     //- Runtime type information
-    TypeName("LaakkonenAlopaeusAittamaa");
+    TypeName("Laakkonen");
 
     // Constructor
 
-        LaakkonenAlopaeusAittamaa
+        Laakkonen
         (
             const populationBalanceModel& popBal,
             const dictionary& dict
@@ -121,7 +121,7 @@ public:
 
 
     //- Destructor
-    virtual ~LaakkonenAlopaeusAittamaa()
+    virtual ~Laakkonen()
     {}
 
 

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "LaakkonenAlopaeusAittamaaDsd.H"
+#include "LaakkonenDaughterSizeDistribution.H"
 #include "addToRunTimeSelectionTable.H"
 #include "breakupModel.H"
 
@@ -35,11 +35,11 @@ namespace diameterModels
 {
 namespace daughterSizeDistributionModels
 {
-    defineTypeNameAndDebug(LaakkonenAlopaeusAittamaaDsd, 0);
+    defineTypeNameAndDebug(LaakkonenDaughterSizeDistribution, 0);
     addToRunTimeSelectionTable
     (
         daughterSizeDistributionModel,
-        LaakkonenAlopaeusAittamaaDsd,
+        LaakkonenDaughterSizeDistribution,
         dictionary
     );
 }
@@ -50,7 +50,7 @@ namespace daughterSizeDistributionModels
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::diameterModels::daughterSizeDistributionModels::
-LaakkonenAlopaeusAittamaaDsd::LaakkonenAlopaeusAittamaaDsd
+LaakkonenDaughterSizeDistribution::LaakkonenDaughterSizeDistribution
 (
     const breakupModel& breakup,
     const dictionary& dict
@@ -64,7 +64,7 @@ LaakkonenAlopaeusAittamaaDsd::LaakkonenAlopaeusAittamaaDsd
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::diameterModels::daughterSizeDistributionModels::
-LaakkonenAlopaeusAittamaaDsd::~LaakkonenAlopaeusAittamaaDsd()
+LaakkonenDaughterSizeDistribution::~LaakkonenDaughterSizeDistribution()
 {}
 
 
@@ -72,7 +72,7 @@ LaakkonenAlopaeusAittamaaDsd::~LaakkonenAlopaeusAittamaaDsd()
 
 Foam::dimensionedScalar
 Foam::diameterModels::daughterSizeDistributionModels::
-LaakkonenAlopaeusAittamaaDsd::antiderivative
+LaakkonenDaughterSizeDistribution::antiderivative
 (
     const dimensionedScalar& xk,
     const dimensionedScalar& v,
@@ -98,7 +98,7 @@ LaakkonenAlopaeusAittamaaDsd::antiderivative
 
 Foam::dimensionedScalar
 Foam::diameterModels::daughterSizeDistributionModels::
-LaakkonenAlopaeusAittamaaDsd::calcNik
+LaakkonenDaughterSizeDistribution::calcNik
 (
     const label i,
     const label k

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H

@@ -23,7 +23,7 @@ License
 
 Class
     Foam::diameterModels::daughterSizeDistributionModels::
-    LaakkonenAlopaeusAittamaaDsd
+    LaakkonenDaughterSizeDistribution
 
 Description
     Daughter size distribution model of Laakkonen et al. (2007). Note that the
@@ -64,12 +64,12 @@ Usage
     \endtable
 
 SourceFiles
-    LaakkonenAlopaeusAittamaaDsd.C
+    LaakkonenBinaryBreakup.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef LaakkonenAlopaeusAittamaaDsd_H
-#define LaakkonenAlopaeusAittamaaDsd_H
+#ifndef LaakkonenDaughterSizeDistribution_H
+#define LaakkonenDaughterSizeDistribution_H
 
 #include "daughterSizeDistributionModel.H"
 
@@ -83,10 +83,10 @@ namespace daughterSizeDistributionModels
 {
 
 /*---------------------------------------------------------------------------*\
-                Class LaakkonenAlopaeusAittamaaDsd Declaration
+              Class LaakkonenDaughterSizeDistribution Declaration
 \*---------------------------------------------------------------------------*/
 
-class LaakkonenAlopaeusAittamaaDsd
+class LaakkonenDaughterSizeDistribution
 :
     public daughterSizeDistributionModel
 {
@@ -99,12 +99,12 @@ class LaakkonenAlopaeusAittamaaDsd
 public:
 
     //- Runtime type information
-    TypeName("LaakkonenAlopaeusAittamaa");
+    TypeName("Laakkonen");
 
 
     // Constructor
 
-        LaakkonenAlopaeusAittamaaDsd
+        LaakkonenDaughterSizeDistribution
         (
             const breakupModel& breakup,
             const dictionary& dict
@@ -112,7 +112,7 @@ public:
 
 
     //- Destructor
-    virtual ~LaakkonenAlopaeusAittamaaDsd();
+    virtual ~LaakkonenDaughterSizeDistribution();
 
 
     // Member Functions