From 6ec38c4dbb5fda8896bf0de2ffc859b2d05f01f3 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 9 Dec 2013 09:40:25 +0000
Subject: [PATCH] ENH: Updated spray sub-models to use new base class
---
.../AtomizationModel/AtomizationModel/AtomizationModel.C | 8 ++++----
.../AtomizationModel/AtomizationModel/AtomizationModel.H | 6 +++---
.../submodels/BreakupModel/BreakupModel/BreakupModel.C | 6 +++---
.../submodels/BreakupModel/BreakupModel/BreakupModel.H | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.C b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.C
index 5ef8c9126da..d406b6bd29d 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,7 +33,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel
CloudType& owner
)
:
- SubModelBase<CloudType>(owner)
+ CloudSubModelBase<CloudType>(owner)
{}
@@ -43,7 +43,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel
const AtomizationModel<CloudType>& am
)
:
- SubModelBase<CloudType>(am)
+ CloudSubModelBase<CloudType>(am)
{}
@@ -55,7 +55,7 @@ Foam::AtomizationModel<CloudType>::AtomizationModel
const word& type
)
:
- SubModelBase<CloudType>(owner, dict, typeName, type)
+ CloudSubModelBase<CloudType>(owner, dict, typeName, type)
{}
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
index 5af433d1f5a..fc8d4c03750 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,7 +39,7 @@ SourceFiles
#include "IOdictionary.H"
#include "autoPtr.H"
#include "runTimeSelectionTables.H"
-#include "SubModelBase.H"
+#include "CloudSubModelBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +53,7 @@ namespace Foam
template<class CloudType>
class AtomizationModel
:
- public SubModelBase<CloudType>
+ public CloudSubModelBase<CloudType>
{
public:
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
index 521cc4d12d0..2b9efbcea45 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
@@ -33,7 +33,7 @@ Foam::BreakupModel<CloudType>::BreakupModel
CloudType& owner
)
:
- SubModelBase<CloudType>(owner),
+ CloudSubModelBase<CloudType>(owner),
solveOscillationEq_(false),
y0_(0.0),
yDot0_(0.0),
@@ -49,7 +49,7 @@ Foam::BreakupModel<CloudType>::BreakupModel
const BreakupModel<CloudType>& bum
)
:
- SubModelBase<CloudType>(bum),
+ CloudSubModelBase<CloudType>(bum),
solveOscillationEq_(bum.solveOscillationEq_),
y0_(bum.y0_),
yDot0_(bum.yDot0_),
@@ -68,7 +68,7 @@ Foam::BreakupModel<CloudType>::BreakupModel
bool solveOscillationEq
)
:
- SubModelBase<CloudType>(owner, dict, typeName, type),
+ CloudSubModelBase<CloudType>(owner, dict, typeName, type),
solveOscillationEq_(solveOscillationEq),
y0_(0.0),
yDot0_(0.0),
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
index e10c56a0f71..ec51693b03b 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
@@ -52,7 +52,7 @@ namespace Foam
template<class CloudType>
class BreakupModel
:
- public SubModelBase<CloudType>
+ public CloudSubModelBase<CloudType>
{
protected:
--
GitLab