Merge commit 'origin/master' into splitCyclic

This commit is contained in:
mattijs
2010-04-30 15:10:10 +01:00
1069 changed files with 14455 additions and 8251 deletions

View File

@ -30,7 +30,6 @@ License
namespace Foam
{
defineTypeNameAndDebug(curvedEdge, 0);
defineRunTimeSelectionTable(curvedEdge, Istream);
}
@ -87,7 +86,7 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
<< endl;
}
word edgeType(is);
const word edgeType(is);
IstreamConstructorTable::iterator cstrIter =
IstreamConstructorTablePtr_->find(edgeType);
@ -95,7 +94,8 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalErrorIn("curvedEdge::New(const pointField&, Istream&)")
<< "Unknown curvedEdge type " << edgeType << endl << endl
<< "Unknown curvedEdge type "
<< edgeType << nl << nl
<< "Valid curvedEdge types are" << endl
<< IstreamConstructorTablePtr_->sortedToc()
<< abort(FatalError);