Commit 31c76da4 authored by henry's avatar henry
Browse files

Changed the runtime-selection tables to output a sorted toc.

parent 7297ae0e
......@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
) << "Unknown PDRDragModel type "
<< PDRDragModelTypeName << endl << endl
<< "Valid PDRDragModels are : " << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
) << "Unknown XiEqModel type "
<< XiEqModelTypeName << endl << endl
<< "Valid XiEqModels are : " << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
) << "Unknown XiGModel type "
<< XiGModelTypeName << endl << endl
<< "Valid XiGModels are : " << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -54,7 +54,7 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
) << "Unknown XiModel type "
<< XiModelTypeName << endl << endl
<< "Valid XiModels are : " << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -70,7 +70,7 @@ Foam::phaseChangeTwoPhaseMixture::New
) << "Unknown phaseChangeTwoPhaseMixture type "
<< phaseChangeTwoPhaseMixtureTypeName << endl << endl
<< "Valid phaseChangeTwoPhaseMixtures are : " << endl
<< componentsConstructorTablePtr_->toc()
<< componentsConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -57,7 +57,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
<< dragModelType
<< ", constructor not in hash table" << endl << endl
<< " Valid dragModel types are : " << endl;
Info << dictionaryConstructorTablePtr_->toc() << abort(FatalError);
Info << dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
}
return cstrIter()(interfaceDict, alpha, phasea, phaseb);
......
......@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::conductivityModel> Foam::conductivityModel::New
<< conductivityModelType
<< ", constructor not in hash table" << endl << endl
<< " Valid conductivityModelType types are :" << endl;
Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
}
return autoPtr<conductivityModel>(cstrIter()(dict));
......
......@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::frictionalStressModel> Foam::frictionalStressModel::New
<< frictionalStressModelType
<< ", constructor not in hash table" << endl << endl
<< " Valid frictionalStressModelType types are :" << endl;
Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
}
return autoPtr<frictionalStressModel>(cstrIter()(dict));
......
......@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::granularPressureModel> Foam::granularPressureModel::New
<< granularPressureModelType
<< ", constructor not in hash table" << endl << endl
<< " Valid granularPressureModelType types are :" << endl;
Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
}
return autoPtr<granularPressureModel>(cstrIter()(dict));
......
......@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::radialModel> Foam::radialModel::New
<< radialModelType
<< ", constructor not in hash table" << endl << endl
<< " Valid radialModelType types are :" << endl;
Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
}
return autoPtr<radialModel>(cstrIter()(dict));
......
......@@ -50,7 +50,7 @@ Foam::kineticTheoryModels::viscosityModel::New
<< viscosityModelType
<< ", constructor not in hash table" << endl << endl
<< " Valid viscosityModelType types are :" << endl;
Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
}
return autoPtr<viscosityModel>(cstrIter()(dict));
......
......@@ -107,7 +107,7 @@ autoPtr<curvedEdge> curvedEdge::New(const pointField& points, Istream& is)
FatalErrorIn("curvedEdge::New(const pointField&, Istream&)")
<< "Unknown curvedEdge type " << curvedEdgeType << endl << endl
<< "Valid curvedEdge types are" << endl
<< IstreamConstructorTablePtr_->toc()
<< IstreamConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
......
......@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::extrudeModel> Foam::extrudeModel::New
<< extrudeModelType
<< ", constructor not in hash table" << nl << nl
<< " Valid extrudeModel types are :" << nl
<< dictionaryConstructorTablePtr_->toc() << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
......
......@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::ODESolver> Foam::ODESolver::New
) << "Unknown ODESolver type "
<< ODESolverTypeName << endl << endl
<< "Valid ODESolvers are : " << endl
<< ODEConstructorTablePtr_->toc()
<< ODEConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
FatalErrorIn("token::compound::New(const word&, Istream&)")
<< "Unknown compound type " << compoundType << nl << nl
<< "Valid compound types:" << endl
<< IstreamConstructorTablePtr_->toc()
<< IstreamConstructorTablePtr_->sortedToc()
<< abort(FatalError);
}
......
......@@ -89,7 +89,7 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
) << "Unknown function type "
<< functionType << nl << nl
<< "Valid functions are : " << nl
<< dictionaryConstructorTablePtr_->toc() << endl
<< dictionaryConstructorTablePtr_->sortedToc() << endl
<< exit(FatalError);
}
......
......@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
<< patchFieldType
<< endl << endl
<< "Valid patchField types are :" << endl
<< pointPatchConstructorTablePtr_->toc()
<< pointPatchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......@@ -111,7 +111,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
) << "Unknown patchField type " << patchFieldType
<< " for patch type " << p.type() << endl << endl
<< "Valid patchField types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
}
......@@ -182,7 +182,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
) << "unknown patchTypefield type "
<< ptf.type() << endl << endl
<< "Valid patchField types are :" << endl
<< patchMapperConstructorTablePtr_->toc()
<< patchMapperConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -168,7 +168,7 @@ autoPtr<graph::writer> graph::writer::New(const word& graphFormat)
) << "Unknown graph format " << graphFormat
<< endl << endl
<< "Valid graph formats are : " << endl
<< wordConstructorTablePtr_->toc()
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -97,7 +97,7 @@ Foam::lduMatrix::preconditioner::New
) << "Unknown symmetric matrix preconditioner "
<< name << nl << nl
<< "Valid symmetric matrix preconditioners :" << endl
<< symMatrixConstructorTablePtr_->toc()
<< symMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......@@ -125,7 +125,7 @@ Foam::lduMatrix::preconditioner::New
) << "Unknown asymmetric matrix preconditioner "
<< name << nl << nl
<< "Valid asymmetric matrix preconditioners :" << endl
<< asymMatrixConstructorTablePtr_->toc()
<< asymMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -98,7 +98,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
) << "Unknown symmetric matrix smoother "
<< name << nl << nl
<< "Valid symmetric matrix smoothers are :" << endl
<< symMatrixConstructorTablePtr_->toc()
<< symMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......@@ -127,7 +127,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
) << "Unknown asymmetric matrix smoother "
<< name << nl << nl
<< "Valid asymmetric matrix smoothers are :" << endl
<< asymMatrixConstructorTablePtr_->toc()
<< asymMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -77,7 +77,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
"lduMatrix::solver::New", solverControls
) << "Unknown symmetric matrix solver " << name << nl << nl
<< "Valid symmetric matrix solvers are :" << endl
<< symMatrixConstructorTablePtr_->toc()
<< symMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......@@ -106,7 +106,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
"lduMatrix::solver::New", solverControls
) << "Unknown asymmetric matrix solver " << name << nl << nl
<< "Valid asymmetric matrix solvers are :" << endl
<< asymMatrixConstructorTablePtr_->toc()
<< asymMatrixConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -124,9 +124,9 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
) << "Unknown GAMGAgglomeration type "
<< agglomeratorType << ".\n"
<< "Valid algebraic GAMGAgglomeration types are :"
<< lduMatrixConstructorTablePtr_->toc() << endl
<< lduMatrixConstructorTablePtr_->sortedToc() << endl
<< "Valid algebraic GAMGAgglomeration types are :"
<< lduMeshConstructorTablePtr_->toc()
<< lduMeshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
"const lduInterfaceField& fineInterface)"
) << "Unknown GAMGInterfaceField type " << coupleType << ".\n"
<< "Valid GAMGInterfaceField types are :"
<< lduInterfaceConstructorTablePtr_->toc()
<< lduInterfaceConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
"const labelField& neighbourRestrictAddressing)"
) << "Unknown GAMGInterface type " << coupleType << ".\n"
<< "Valid GAMGInterface types are :"
<< lduInterfaceConstructorTablePtr_->toc()
<< lduInterfaceConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -60,7 +60,7 @@ autoPtr<facePointPatch> facePointPatch::New
<< patch.type()
<< endl << endl
<< "Valid facePointPatch types are :" << endl
<< polyPatchConstructorTablePtr_->toc()
<< polyPatchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -59,7 +59,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
) << "Unknown polyPatch type " << patchType << " for patch " << name
<< endl << endl
<< "Valid polyPatch types are :" << endl
<< wordConstructorTablePtr_->toc()
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......@@ -107,7 +107,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
<< " for patch " << name
<< endl << endl
<< "Valid polyPatch types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
}
......
......@@ -62,7 +62,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
dict
) << "Unknown cellZone type " << zoneType << endl << endl
<< "Valid cellZone types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -62,7 +62,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
dict
) << "Unknown faceZone type " << zoneType << endl << endl
<< "Valid faceZone types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -62,7 +62,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
dict
) << "Unknown pointZone type " << zoneType << endl << endl
<< "Valid pointZone types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -142,7 +142,7 @@ Foam::autoPtr<Foam::ensightPart> Foam::ensightPart::New(Istream& is)
is
) << "unknown ensightPart type " << partType << endl << endl
<< "Valid ensightPart types are :" << endl
<< istreamConstructorTablePtr_->toc()
<< istreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
) << "Unknown decompositionMethod "
<< decompositionMethodTypeName << endl << endl
<< "Valid decompositionMethods are : " << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......@@ -96,7 +96,7 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
) << "Unknown decompositionMethod "
<< decompositionMethodTypeName << endl << endl
<< "Valid decompositionMethods are : " << endl
<< dictionaryMeshConstructorTablePtr_->toc()
<< dictionaryMeshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -79,7 +79,7 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
) << "Unknown dynamicFvMesh type " << dynamicFvMeshTypeName
<< endl << endl
<< "Valid dynamicFvMesh types are :" << endl
<< IOobjectConstructorTablePtr_->toc()
<< IOobjectConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::solidBodyMotionFunction> Foam::solidBodyMotionFunction::New
) << "Unknown solidBodyMotionFunction type "
<< solidBodyMotionFunctionTypeName << endl << endl
<< "Valid solidBodyMotionFunctions are : " << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -62,7 +62,7 @@ autoPtr<cellLooper> cellLooper::New
) << "Unknown set type " << type
<< endl << endl
<< "Valid cellLooper types : " << endl
<< wordConstructorTablePtr_->toc()
<< wordConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -107,7 +107,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh)
) << "Unknown solver type " << solverTypeName
<< endl << endl
<< "Valid solver types are: " << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -64,7 +64,7 @@ autoPtr<polyMeshModifier> polyMeshModifier::New
dict
) << "Unknown polyMeshModifier type " << patchType << endl << endl
<< "Valid polyMeshModifier types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -69,7 +69,7 @@ Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New
) << "Unknown engineMesh type " << engineMeshTypeName
<< endl << endl
<< "Valid engineMesh types are :" << endl
<< IOobjectConstructorTablePtr_->toc()
<< IOobjectConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -76,7 +76,7 @@ autoPtr<SRFModel> SRFModel::New
) << "Unknown SRFModel type " << SRFModelTypeName
<< nl << nl
<< "Valid SRFModel types are :" << nl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -54,7 +54,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
) << "Unknown patchTypefield type " << patchFieldType
<< endl << endl
<< "Valid patchField types are :" << endl
<< patchConstructorTablePtr_->toc()
<< patchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......@@ -111,7 +111,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
) << "Unknown patchField type " << patchFieldType
<< " for patch type " << p.type() << endl << endl
<< "Valid patchField types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
}
......@@ -178,7 +178,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
"const fvPatchFieldMapper&)"
) << "unknown patchTypefield type " << ptf.type() << endl << endl
<< "Valid patchField types are :" << endl
<< patchMapperConstructorTablePtr_->toc()
<< patchMapperConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -59,7 +59,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
) << "Unknown patchTypefield type " << patchFieldType
<< endl << endl
<< "Valid patchField types are :" << endl
<< patchConstructorTablePtr_->toc()
<< patchConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......@@ -115,7 +115,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
) << "Unknown patchField type " << patchFieldType
<< " for patch type " << p.type() << endl << endl
<< "Valid patchField types are :" << endl
<< dictionaryConstructorTablePtr_->toc()
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
}
......@@ -183,7 +183,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
"const fvPatchFieldMapper&)"
) << "unknown patchTypefield type " << ptf.type() << endl << endl
<< "Valid patchField types are :" << endl
<< patchMapperConstructorTablePtr_->toc()
<< patchMapperConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
......
......@@ -79,7 +79,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
schemeData
) << "Convection scheme not specified" << endl << endl
<< "Valid convection schemes are :" << endl
<< IstreamConstructorTablePtr_->toc()
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......@@ -97,7 +97,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
schemeData
) << "unknown convection scheme " << schemeName << endl << endl
<< "Valid convection schemes are :" << endl
<< IstreamConstructorTablePtr_->toc()
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......@@ -136,7 +136,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
schemeData
) << "Convection scheme not specified" << endl << endl
<< "Valid convection schemes are :" << endl
<< MultivariateConstructorTablePtr_->toc()
<< MultivariateConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......@@ -156,7 +156,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
schemeData
) << "unknown convection scheme " << schemeName << endl << endl
<< "Valid convection schemes are :" << endl
<< MultivariateConstructorTablePtr_->toc()
<< MultivariateConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......
......@@ -64,7 +64,7 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
schemeData
) << "D2dt2 scheme not specified" << endl << endl
<< "Valid d2dt2 schemes are :" << endl
<< IstreamConstructorTablePtr_->toc()
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
......@@ -81,7 +81,7 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
schemeData
) << "unknown d2dt2 scheme " << schemeName << endl << endl
<< "Valid d2dt2 schemes are :" << endl
<< IstreamConstructorTablePtr_->toc()
<< IstreamConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}