From 40ddfb4277898357a58c6834f38a3903b1f9c9b8 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 8 Jun 2017 16:06:16 +0100
Subject: [PATCH] COMP: renamed runtime selection table to avoid duplicate
entry clashes
---
.../constantSurfaceTensionCoefficient.C | 2 +-
.../surfaceTensionModel/newSurfaceTensionModel.C | 6 +++---
.../surfaceTensionModel/surfaceTensionModel.C | 2 +-
.../surfaceTensionModel/surfaceTensionModel.H | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
index d0632c55dce..72392f76c35 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
@@ -38,7 +38,7 @@ namespace surfaceTensionModels
(
surfaceTensionModel,
constantSurfaceTensionCoefficient,
- dictionary
+ multiphase
);
}
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
index f14c0da92f5..f2c28eeb5dd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
@@ -40,8 +40,8 @@ Foam::surfaceTensionModel::New
Info<< "Selecting surfaceTensionModel for "
<< pair << ": " << surfaceTensionModelType << endl;
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(surfaceTensionModelType);
+ multiphaseConstructorTable::iterator cstrIter =
+ multiphaseConstructorTablePtr_->find(surfaceTensionModelType);
if (!cstrIter.found())
{
@@ -49,7 +49,7 @@ Foam::surfaceTensionModel::New
<< "Unknown surfaceTensionModelType type "
<< surfaceTensionModelType << endl << endl
<< "Valid surfaceTensionModel types are : " << endl
- << dictionaryConstructorTablePtr_->sortedToc()
+ << multiphaseConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
index 8d7a487495a..9836cad2356 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(surfaceTensionModel, 0);
- defineRunTimeSelectionTable(surfaceTensionModel, dictionary);
+ defineRunTimeSelectionTable(surfaceTensionModel, multiphase);
}
const Foam::dimensionSet Foam::surfaceTensionModel::dimSigma(1, 0, -2, 0, 0);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
index 8fb8877d5ca..a69f14e58e2 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
@@ -73,7 +73,7 @@ public:
(
autoPtr,
surfaceTensionModel,
- dictionary,
+ multiphase,
(
const dictionary& dict,
const phasePair& pair,
--
GitLab