MRG: resolved merge conflicts from merge from develop branch

This commit is contained in:
Andrew Heather
2017-05-19 16:29:54 +01:00
308 changed files with 2914 additions and 1667 deletions

View File

@ -130,7 +130,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(solverTypeName);
if (cstrIter == dictionaryConstructorTablePtr_->end())
if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown solver type "