COMP: renamed runtime selection table to avoid duplicate entry clashes

This commit is contained in:
Andrew Heather
2017-06-08 16:06:16 +01:00
parent 2b060155c3
commit 40ddfb4277
4 changed files with 6 additions and 6 deletions

View File

@ -38,7 +38,7 @@ namespace surfaceTensionModels
(
surfaceTensionModel,
constantSurfaceTensionCoefficient,
dictionary
multiphase
);
}
}

View File

@ -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);
}

View File

@ -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);

View File

@ -73,7 +73,7 @@ public:
(
autoPtr,
surfaceTensionModel,
dictionary,
multiphase,
(
const dictionary& dict,
const phasePair& pair,