mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge commit 'origin/master' into splitCyclic
This commit is contained in:
@ -47,13 +47,12 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
|
||||
const dictionary& decompositionDict
|
||||
)
|
||||
{
|
||||
word decompositionMethodTypeName(decompositionDict.lookup("method"));
|
||||
const word methodType(decompositionDict.lookup("method"));
|
||||
|
||||
Info<< "Selecting decompositionMethod "
|
||||
<< decompositionMethodTypeName << endl;
|
||||
Info<< "Selecting decompositionMethod " << methodType << endl;
|
||||
|
||||
dictionaryConstructorTable::iterator cstrIter =
|
||||
dictionaryConstructorTablePtr_->find(decompositionMethodTypeName);
|
||||
dictionaryConstructorTablePtr_->find(methodType);
|
||||
|
||||
if (cstrIter == dictionaryConstructorTablePtr_->end())
|
||||
{
|
||||
@ -62,7 +61,7 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
|
||||
"decompositionMethod::New"
|
||||
"(const dictionary& decompositionDict)"
|
||||
) << "Unknown decompositionMethod "
|
||||
<< decompositionMethodTypeName << endl << endl
|
||||
<< methodType << nl << nl
|
||||
<< "Valid decompositionMethods are : " << endl
|
||||
<< dictionaryConstructorTablePtr_->sortedToc()
|
||||
<< exit(FatalError);
|
||||
@ -78,13 +77,12 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
|
||||
const polyMesh& mesh
|
||||
)
|
||||
{
|
||||
word decompositionMethodTypeName(decompositionDict.lookup("method"));
|
||||
const word methodType(decompositionDict.lookup("method"));
|
||||
|
||||
Info<< "Selecting decompositionMethod "
|
||||
<< decompositionMethodTypeName << endl;
|
||||
Info<< "Selecting decompositionMethod " << methodType << endl;
|
||||
|
||||
dictionaryMeshConstructorTable::iterator cstrIter =
|
||||
dictionaryMeshConstructorTablePtr_->find(decompositionMethodTypeName);
|
||||
dictionaryMeshConstructorTablePtr_->find(methodType);
|
||||
|
||||
if (cstrIter == dictionaryMeshConstructorTablePtr_->end())
|
||||
{
|
||||
@ -94,7 +92,7 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
|
||||
"(const dictionary& decompositionDict, "
|
||||
"const polyMesh& mesh)"
|
||||
) << "Unknown decompositionMethod "
|
||||
<< decompositionMethodTypeName << endl << endl
|
||||
<< methodType << nl << nl
|
||||
<< "Valid decompositionMethods are : " << endl
|
||||
<< dictionaryMeshConstructorTablePtr_->sortedToc()
|
||||
<< exit(FatalError);
|
||||
|
||||
Reference in New Issue
Block a user