From c4fd345ab1de53a2e385008813cba037de2b3978 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 Aug 2009 10:46:03 +0100 Subject: [PATCH 1/5] added solverFreq to read(), and changed fvm->fvmSup header --- .../radiation/radiationModel/radiationModel/radiationModel.C | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C index 2aaa7d7e67..be93dc011e 100644 --- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C +++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C @@ -27,7 +27,7 @@ License #include "radiationModel.H" #include "absorptionEmissionModel.H" #include "scatterModel.H" -#include "fvm.H" +#include "fvmSup.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -112,6 +112,9 @@ bool Foam::radiation::radiationModel::read() lookup("radiation") >> radiation_; coeffs_ = subDict(type() + "Coeffs"); + lookup("solverFreq") >> solverFreq_, + solverFreq_ = max(1, solverFreq_); + return true; } else From df37b6b4313b62bc46bb882f889e0b8d597184cd Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 Aug 2009 11:38:16 +0100 Subject: [PATCH 2/5] read not pure virtual --- .../radiation/radiationModel/radiationModel/radiationModel.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H index 4d01dee1cf..aae443461e 100644 --- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H +++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H @@ -163,7 +163,7 @@ public: virtual void calculate() = 0; //- Read radiationProperties dictionary - virtual bool read() = 0; + virtual bool read(); // Access From 85f11fa7ccee75df61de41d27ac45cda1b07c9fb Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 6 Aug 2009 17:43:39 +0100 Subject: [PATCH 3/5] added sortedToc() --- applications/test/HashTable/hashTableTest.C | 1 + .../containers/HashTables/HashTable/HashTable.C | 11 ++++++++++- .../containers/HashTables/HashTable/HashTable.H | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/applications/test/HashTable/hashTableTest.C b/applications/test/HashTable/hashTableTest.C index 25338a2bb7..7e03a36f7d 100644 --- a/applications/test/HashTable/hashTableTest.C +++ b/applications/test/HashTable/hashTableTest.C @@ -56,6 +56,7 @@ int main() table1.erase("abs"); Info<< "\ntable1 toc: " << table1.toc() << endl; + Info<< "\ntable1 sortedToc: " << table1.sortedToc() << endl; table1.printInfo(Info) << "table1 [" << table1.size() << "] " << endl; forAllIter(HASHTABLE_CLASS, table1, iter) diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C index c2034a69ea..10bcadc761 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C @@ -231,7 +231,6 @@ Foam::HashTable::find } -// Return the table of contents template Foam::List Foam::HashTable::toc() const { @@ -247,6 +246,16 @@ Foam::List Foam::HashTable::toc() const } +template +Foam::List Foam::HashTable::sortedToc() const +{ + List sortedList = this->toc(); + sort(sortedList); + + return sortedList; +} + + template bool Foam::HashTable::set ( diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H index 3871db3a50..666b93ebec 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H @@ -198,6 +198,9 @@ public: //- Return the table of contents List toc() const; + //- Return the table of contents as a sorted list + List sortedToc() const; + //- Print information Ostream& printInfo(Ostream&) const; From 31c76da40f58d2c44acb748b28d3f98e3abe6d2e Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 6 Aug 2009 18:01:28 +0100 Subject: [PATCH 4/5] Changed the runtime-selection tables to output a sorted toc. --- .../PDRModels/dragModels/PDRDragModel/newPDRDragModel.C | 2 +- .../PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C | 2 +- .../PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C | 2 +- .../combustion/PDRFoam/XiModels/XiModel/newXiModel.C | 2 +- .../newPhaseChangeTwoPhaseMixture.C | 2 +- .../interfacialModels/dragModels/dragModel/newDragModel.C | 2 +- .../conductivityModel/newConductivityModel.C | 2 +- .../frictionalStressModel/newFrictionalStressModel.C | 2 +- .../granularPressureModel/newGranularPressureModel.C | 2 +- .../radialModel/radialModel/newRadialModel.C | 2 +- .../viscosityModel/viscosityModel/newViscosityModel.C | 2 +- .../mesh/generation/blockMesh/curvedEdges/curvedEdge.C | 2 +- .../extrudeModel/extrudeModel/newExtrudeModel.C | 2 +- src/ODE/ODESolvers/ODESolver/newODESolver.C | 2 +- src/OpenFOAM/db/IOstreams/token/token.C | 2 +- .../db/functionObjects/functionObject/functionObject.C | 2 +- .../pointPatchFields/pointPatchField/newPointPatchField.C | 6 +++--- src/OpenFOAM/graph/graph.C | 2 +- .../lduMatrix/lduMatrix/lduMatrixPreconditioner.C | 4 ++-- .../matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C | 4 ++-- .../matrices/lduMatrix/lduMatrix/lduMatrixSolver.C | 4 ++-- .../GAMGAgglomeration/GAMGAgglomeration.C | 4 ++-- .../GAMGInterfaceField/newGAMGInterfaceField.C | 2 +- .../GAMG/interfaces/GAMGInterface/newGAMGInterface.C | 2 +- .../pointPatches/facePointPatch/newFacePointPatch.C | 2 +- .../meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C | 4 ++-- src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C | 2 +- src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C | 2 +- .../meshes/polyMesh/zones/pointZone/newPointZone.C | 2 +- src/conversion/ensight/part/ensightPart.C | 2 +- .../decompositionMethod/decompositionMethod.C | 4 ++-- src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C | 2 +- .../solidBodyMotionFunction/newSolidBodyMotionFunction.C | 2 +- src/dynamicMesh/meshCut/cellLooper/cellLooper.C | 2 +- src/dynamicMesh/motionSolver/motionSolver.C | 2 +- .../polyTopoChange/polyMeshModifier/newPolyMeshModifier.C | 2 +- src/engine/engineMesh/engineMesh/newEngineMesh.C | 2 +- .../cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C | 2 +- .../fields/fvPatchFields/fvPatchField/newFvPatchField.C | 6 +++--- .../fvsPatchFields/fvsPatchField/newFvsPatchField.C | 6 +++--- .../convectionSchemes/convectionScheme/convectionScheme.C | 8 ++++---- .../finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C | 4 ++-- .../finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C | 4 ++-- .../finiteVolume/divSchemes/divScheme/divScheme.C | 4 ++-- .../finiteVolume/gradSchemes/gradScheme/gradScheme.C | 4 ++-- .../laplacianSchemes/laplacianScheme/laplacianScheme.C | 4 ++-- .../snGradSchemes/snGradScheme/snGradScheme.C | 4 ++-- src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C | 2 +- .../interpolation/interpolation/newInterpolation.C | 2 +- .../limitedSurfaceInterpolationScheme.C | 8 ++++---- .../multivariateSurfaceInterpolationScheme.C | 2 +- .../surfaceInterpolationScheme.C | 8 ++++---- .../motionDiffusivity/motionDiffusivity.C | 2 +- .../dieselSpray/injector/injectorType/injectorType.C | 2 +- .../atomizationModel/newAtomizationModel.C | 2 +- .../breakupModel/breakupModel/newBreakupModel.C | 2 +- .../collisionModel/collisionModel/newCollisionModel.C | 2 +- .../dispersionModel/dispersionModel/newDispersionModel.C | 2 +- .../spraySubModels/dragModel/dragModel/newDragModel.C | 2 +- .../evaporationModel/newEvaporationModel.C | 2 +- .../heatTransferModel/newHeatTransferModel.C | 2 +- .../injectorModel/injectorModel/newInjectorModel.C | 2 +- .../spraySubModels/wallModel/wallModel/newWallModel.C | 2 +- .../BinaryCollisionModel/NewBinaryCollisionModel.C | 2 +- .../InflowBoundaryModel/NewInflowBoundaryModel.C | 2 +- .../WallInteractionModel/NewWallInteractionModel.C | 2 +- .../IntegrationScheme/newIntegrationScheme.C | 2 +- .../submodels/IO/DataEntry/DataEntry/NewDataEntry.C | 2 +- .../DispersionModel/DispersionModel/NewDispersionModel.C | 2 +- .../Kinematic/DragModel/DragModel/NewDragModel.C | 2 +- .../InjectionModel/InjectionModel/NewInjectionModel.C | 2 +- .../PatchInteractionModel/NewPatchInteractionModel.C | 2 +- .../PostProcessingModel/NewPostProcessingModel.C | 2 +- .../CompositionModel/NewCompositionModel.C | 2 +- .../PhaseChangeModel/NewPhaseChangeModel.C | 2 +- .../DevolatilisationModel/NewDevolatilisationModel.C | 2 +- .../SurfaceReactionModel/NewSurfaceReactionModel.C | 2 +- .../HeatTransferModel/NewHeatTransferModel.C | 2 +- .../basic/newEnergyScalingFunction.C | 2 +- .../potential/pairPotential/basic/newPairPotential.C | 2 +- .../potential/tetherPotential/basic/newTetherPotential.C | 2 +- .../coordinateRotation/coordinateRotation.C | 2 +- src/meshTools/coordinateSystems/coordinateSystemNew.C | 4 ++-- src/meshTools/searchableSurface/searchableSurface.C | 2 +- src/meshTools/sets/topoSetSource/topoSetSource.C | 4 ++-- src/meshTools/sets/topoSets/topoSet.C | 4 ++-- .../foamCalcFunctions/calcType/newCalcType.C | 2 +- src/sampling/sampledSet/sampledSet/sampledSet.C | 2 +- src/sampling/sampledSet/writers/writer.C | 2 +- .../sampledSurface/sampledSurface/sampledSurface.C | 2 +- src/sampling/sampledSurface/writers/surfaceWriter.C | 2 +- .../newBarotropicCompressibilityModel.C | 2 +- .../basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C | 2 +- .../basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C | 2 +- .../psiChemistryModel/newPsiChemistryModel.C | 4 ++-- .../rhoChemistryModel/newRhoChemistryModel.C | 4 ++-- .../chemistrySolver/chemistrySolver/newChemistrySolver.C | 2 +- .../laminarFlameSpeed/newLaminarFlameSpeed.C | 2 +- src/thermophysicalModels/liquids/liquid/liquid.C | 4 ++-- src/thermophysicalModels/pdfs/pdf/newPdf.C | 2 +- .../radiationModel/radiationModel/newRadiationModel.C | 2 +- .../absorptionEmissionModel/newAbsorptionEmissionModel.C | 2 +- .../submodels/scatterModel/scatterModel/newScatterModel.C | 2 +- .../chemistryReaders/chemistryReader/chemistryReader.C | 2 +- .../hCombustionThermo/newhCombustionThermo.C | 6 +++--- .../hhuCombustionThermo/newhhuCombustionThermo.C | 2 +- .../reactionThermo/hReactionThermo/newhReactionThermo.C | 6 +++--- src/thermophysicalModels/solids/solid/newSolid.C | 4 ++-- .../specie/reaction/Reactions/Reaction/Reaction.C | 4 ++-- .../thermophysicalFunction/thermophysicalFunction.C | 2 +- .../viscosityModels/viscosityModel/newViscosityModel.C | 2 +- src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C | 2 +- src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C | 2 +- src/turbulenceModels/compressible/LES/LESModel/LESModel.C | 2 +- src/turbulenceModels/compressible/RAS/RASModel/RASModel.C | 2 +- .../compressible/turbulenceModel/turbulenceModel.C | 2 +- .../incompressible/LES/LESModel/LESModel.C | 2 +- .../incompressible/RAS/RASModel/RASModel.C | 2 +- .../incompressible/turbulenceModel/turbulenceModel.C | 2 +- 119 files changed, 158 insertions(+), 158 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C index 29a92e19f8..d8fd2dd5e3 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C @@ -52,7 +52,7 @@ Foam::autoPtr Foam::PDRDragModel::New ) << "Unknown PDRDragModel type " << PDRDragModelTypeName << endl << endl << "Valid PDRDragModels are : " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C index 43515c6bae..f0bc471c91 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C @@ -56,7 +56,7 @@ Foam::autoPtr Foam::XiEqModel::New ) << "Unknown XiEqModel type " << XiEqModelTypeName << endl << endl << "Valid XiEqModels are : " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C index 780bc8418d..81f5cca253 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C @@ -56,7 +56,7 @@ Foam::autoPtr Foam::XiGModel::New ) << "Unknown XiGModel type " << XiGModelTypeName << endl << endl << "Valid XiGModels are : " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C index fd1e25de9b..2dc8dac138 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C @@ -54,7 +54,7 @@ Foam::autoPtr Foam::XiModel::New ) << "Unknown XiModel type " << XiModelTypeName << endl << endl << "Valid XiModels are : " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C index 3def1c64fc..227f76c4c7 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C @@ -70,7 +70,7 @@ Foam::phaseChangeTwoPhaseMixture::New ) << "Unknown phaseChangeTwoPhaseMixture type " << phaseChangeTwoPhaseMixtureTypeName << endl << endl << "Valid phaseChangeTwoPhaseMixtures are : " << endl - << componentsConstructorTablePtr_->toc() + << componentsConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index 68bb43a385..582fa4cdd3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -57,7 +57,7 @@ Foam::autoPtr 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); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C index 0ea5d053b9..e5d27350b3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C @@ -49,7 +49,7 @@ Foam::autoPtr 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(cstrIter()(dict)); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C index 96315e8c20..fed001e0c0 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C @@ -49,7 +49,7 @@ Foam::autoPtr 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(cstrIter()(dict)); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C index 0df3d38613..cda9814b46 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C @@ -49,7 +49,7 @@ Foam::autoPtr 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(cstrIter()(dict)); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C index 9e107809bf..fc6b2ed5d9 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C @@ -49,7 +49,7 @@ Foam::autoPtr 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(cstrIter()(dict)); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C index 508673a5d3..5de17ec189 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C @@ -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(cstrIter()(dict)); diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C b/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C index 6a2d41a83e..9329c33f6d 100644 --- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C +++ b/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C @@ -107,7 +107,7 @@ autoPtr 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); } diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C index 967481cff9..e511ef9082 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C +++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C @@ -47,7 +47,7 @@ Foam::autoPtr Foam::extrudeModel::New << extrudeModelType << ", constructor not in hash table" << nl << nl << " Valid extrudeModel types are :" << nl - << dictionaryConstructorTablePtr_->toc() << nl + << dictionaryConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/ODE/ODESolvers/ODESolver/newODESolver.C b/src/ODE/ODESolvers/ODESolver/newODESolver.C index f10bf0bbd1..9f3472ce0c 100644 --- a/src/ODE/ODESolvers/ODESolver/newODESolver.C +++ b/src/ODE/ODESolvers/ODESolver/newODESolver.C @@ -47,7 +47,7 @@ Foam::autoPtr Foam::ODESolver::New ) << "Unknown ODESolver type " << ODESolverTypeName << endl << endl << "Valid ODESolvers are : " << endl - << ODEConstructorTablePtr_->toc() + << ODEConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C index f74dbd7381..271ec286a7 100644 --- a/src/OpenFOAM/db/IOstreams/token/token.C +++ b/src/OpenFOAM/db/IOstreams/token/token.C @@ -67,7 +67,7 @@ Foam::autoPtr 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); } diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index 3157cea04b..b07f5d790d 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -89,7 +89,7 @@ Foam::autoPtr Foam::functionObject::New ) << "Unknown function type " << functionType << nl << nl << "Valid functions are : " << nl - << dictionaryConstructorTablePtr_->toc() << endl + << dictionaryConstructorTablePtr_->sortedToc() << endl << exit(FatalError); } diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C index 0669f0e796..8efa87c3ec 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C @@ -55,7 +55,7 @@ Foam::autoPtr > Foam::pointPatchField::New << patchFieldType << endl << endl << "Valid patchField types are :" << endl - << pointPatchConstructorTablePtr_->toc() + << pointPatchConstructorTablePtr_->sortedToc() << exit(FatalError); } @@ -111,7 +111,7 @@ Foam::autoPtr > Foam::pointPatchField::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::New ) << "unknown patchTypefield type " << ptf.type() << endl << endl << "Valid patchField types are :" << endl - << patchMapperConstructorTablePtr_->toc() + << patchMapperConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C index adb9371333..ed9fde5817 100644 --- a/src/OpenFOAM/graph/graph.C +++ b/src/OpenFOAM/graph/graph.C @@ -168,7 +168,7 @@ autoPtr graph::writer::New(const word& graphFormat) ) << "Unknown graph format " << graphFormat << endl << endl << "Valid graph formats are : " << endl - << wordConstructorTablePtr_->toc() + << wordConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C index c85cf074be..aa97913cf0 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C @@ -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); } diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C index 4ce5381fb1..6f4b38d147 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C @@ -98,7 +98,7 @@ Foam::autoPtr 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::New ) << "Unknown asymmetric matrix smoother " << name << nl << nl << "Valid asymmetric matrix smoothers are :" << endl - << asymMatrixConstructorTablePtr_->toc() + << asymMatrixConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C index cb17295a3e..0114c0f08a 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C @@ -77,7 +77,7 @@ Foam::autoPtr 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::New "lduMatrix::solver::New", solverControls ) << "Unknown asymmetric matrix solver " << name << nl << nl << "Valid asymmetric matrix solvers are :" << endl - << asymMatrixConstructorTablePtr_->toc() + << asymMatrixConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C index 633b8e2f37..47e1d4dbd3 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C @@ -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); } diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C index 61251878c1..a083dcae54 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C @@ -48,7 +48,7 @@ Foam::autoPtr Foam::GAMGInterfaceField::New "const lduInterfaceField& fineInterface)" ) << "Unknown GAMGInterfaceField type " << coupleType << ".\n" << "Valid GAMGInterfaceField types are :" - << lduInterfaceConstructorTablePtr_->toc() + << lduInterfaceConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C index 196a91f0c4..7cb1ecf147 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C @@ -52,7 +52,7 @@ Foam::autoPtr Foam::GAMGInterface::New "const labelField& neighbourRestrictAddressing)" ) << "Unknown GAMGInterface type " << coupleType << ".\n" << "Valid GAMGInterface types are :" - << lduInterfaceConstructorTablePtr_->toc() + << lduInterfaceConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C index 4e870225e6..4146954746 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C @@ -60,7 +60,7 @@ autoPtr facePointPatch::New << patch.type() << endl << endl << "Valid facePointPatch types are :" << endl - << polyPatchConstructorTablePtr_->toc() + << polyPatchConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C index f456fc8404..deceda1eef 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C @@ -59,7 +59,7 @@ Foam::autoPtr 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::New << " for patch " << name << endl << endl << "Valid polyPatch types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); } } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C index e715812150..1905c9beda 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C @@ -62,7 +62,7 @@ Foam::autoPtr Foam::cellZone::New dict ) << "Unknown cellZone type " << zoneType << endl << endl << "Valid cellZone types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C index 5e77ee7778..91506f5ce8 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C @@ -62,7 +62,7 @@ Foam::autoPtr Foam::faceZone::New dict ) << "Unknown faceZone type " << zoneType << endl << endl << "Valid faceZone types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C index afdc80e322..015bdea318 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C @@ -62,7 +62,7 @@ Foam::autoPtr Foam::pointZone::New dict ) << "Unknown pointZone type " << zoneType << endl << endl << "Valid pointZone types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C index c02f6c9896..a8b4e50308 100644 --- a/src/conversion/ensight/part/ensightPart.C +++ b/src/conversion/ensight/part/ensightPart.C @@ -142,7 +142,7 @@ Foam::autoPtr Foam::ensightPart::New(Istream& is) is ) << "unknown ensightPart type " << partType << endl << endl << "Valid ensightPart types are :" << endl - << istreamConstructorTablePtr_->toc() + << istreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C index b526f391ef..01b1a56d03 100644 --- a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C +++ b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C @@ -64,7 +64,7 @@ Foam::autoPtr 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::New ) << "Unknown decompositionMethod " << decompositionMethodTypeName << endl << endl << "Valid decompositionMethods are : " << endl - << dictionaryMeshConstructorTablePtr_->toc() + << dictionaryMeshConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C b/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C index ca300e4d36..5dfe589ec3 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C +++ b/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C @@ -79,7 +79,7 @@ Foam::autoPtr Foam::dynamicFvMesh::New(const IOobject& io) ) << "Unknown dynamicFvMesh type " << dynamicFvMeshTypeName << endl << endl << "Valid dynamicFvMesh types are :" << endl - << IOobjectConstructorTablePtr_->toc() + << IOobjectConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C index 11e6e656b3..8c9fcbc522 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C @@ -55,7 +55,7 @@ Foam::autoPtr Foam::solidBodyMotionFunction::New ) << "Unknown solidBodyMotionFunction type " << solidBodyMotionFunctionTypeName << endl << endl << "Valid solidBodyMotionFunctions are : " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C index d7cd195837..83fb08bc5c 100644 --- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C +++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C @@ -62,7 +62,7 @@ autoPtr cellLooper::New ) << "Unknown set type " << type << endl << endl << "Valid cellLooper types : " << endl - << wordConstructorTablePtr_->toc() + << wordConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/dynamicMesh/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolver/motionSolver.C index a7a8883371..5966679feb 100644 --- a/src/dynamicMesh/motionSolver/motionSolver.C +++ b/src/dynamicMesh/motionSolver/motionSolver.C @@ -107,7 +107,7 @@ Foam::autoPtr Foam::motionSolver::New(const polyMesh& mesh) ) << "Unknown solver type " << solverTypeName << endl << endl << "Valid solver types are: " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C index 00547da73b..ca2d7b6826 100644 --- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C +++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C @@ -64,7 +64,7 @@ autoPtr polyMeshModifier::New dict ) << "Unknown polyMeshModifier type " << patchType << endl << endl << "Valid polyMeshModifier types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/engine/engineMesh/engineMesh/newEngineMesh.C b/src/engine/engineMesh/engineMesh/newEngineMesh.C index bf2a6033df..158db3073e 100644 --- a/src/engine/engineMesh/engineMesh/newEngineMesh.C +++ b/src/engine/engineMesh/engineMesh/newEngineMesh.C @@ -69,7 +69,7 @@ Foam::autoPtr Foam::engineMesh::New ) << "Unknown engineMesh type " << engineMeshTypeName << endl << endl << "Valid engineMesh types are :" << endl - << IOobjectConstructorTablePtr_->toc() + << IOobjectConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C index ff94172db0..cc4400daba 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C @@ -76,7 +76,7 @@ autoPtr SRFModel::New ) << "Unknown SRFModel type " << SRFModelTypeName << nl << nl << "Valid SRFModel types are :" << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C index 59fc3b3633..3ef0d0e427 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C @@ -54,7 +54,7 @@ Foam::tmp > Foam::fvPatchField::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::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::New "const fvPatchFieldMapper&)" ) << "unknown patchTypefield type " << ptf.type() << endl << endl << "Valid patchField types are :" << endl - << patchMapperConstructorTablePtr_->toc() + << patchMapperConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C index 38abb38d8c..d8427a3445 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C @@ -59,7 +59,7 @@ tmp > fvsPatchField::New ) << "Unknown patchTypefield type " << patchFieldType << endl << endl << "Valid patchField types are :" << endl - << patchConstructorTablePtr_->toc() + << patchConstructorTablePtr_->sortedToc() << exit(FatalError); } @@ -115,7 +115,7 @@ tmp > fvsPatchField::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::New "const fvPatchFieldMapper&)" ) << "unknown patchTypefield type " << ptf.type() << endl << endl << "Valid patchField types are :" << endl - << patchMapperConstructorTablePtr_->toc() + << patchMapperConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C index 1a8947cd8c..ce5c19d791 100644 --- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C +++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C @@ -79,7 +79,7 @@ tmp > convectionScheme::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::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::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::New schemeData ) << "unknown convection scheme " << schemeName << endl << endl << "Valid convection schemes are :" << endl - << MultivariateConstructorTablePtr_->toc() + << MultivariateConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C index 9783d2694d..0018817c68 100644 --- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C +++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C @@ -64,7 +64,7 @@ tmp > d2dt2Scheme::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::New schemeData ) << "unknown d2dt2 scheme " << schemeName << endl << endl << "Valid d2dt2 schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C index 854060453f..80d47fe830 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C @@ -62,7 +62,7 @@ tmp > ddtScheme::New schemeData ) << "Ddt scheme not specified" << endl << endl << "Valid ddt schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -79,7 +79,7 @@ tmp > ddtScheme::New schemeData ) << "unknown ddt scheme " << schemeName << endl << endl << "Valid ddt schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C index e40cece4d4..8d283b9fc8 100644 --- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C +++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C @@ -65,7 +65,7 @@ tmp > divScheme::New schemeData ) << "Div scheme not specified" << endl << endl << "Valid div schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -82,7 +82,7 @@ tmp > divScheme::New schemeData ) << "unknown div scheme " << schemeName << endl << endl << "Valid div schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C index ae5c3afce1..6d7cc56560 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C @@ -64,7 +64,7 @@ tmp > gradScheme::New schemeData ) << "Grad scheme not specified" << endl << endl << "Valid grad schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -81,7 +81,7 @@ tmp > gradScheme::New schemeData ) << "unknown grad scheme " << schemeName << endl << endl << "Valid grad schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C index a0b04008e2..eb14f253ad 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C @@ -63,7 +63,7 @@ tmp > laplacianScheme::New schemeData ) << "Laplacian scheme not specified" << endl << endl << "Valid laplacian schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -80,7 +80,7 @@ tmp > laplacianScheme::New schemeData ) << "unknown laplacian scheme " << schemeName << endl << endl << "Valid laplacian schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C index 54f5ff5460..5fee351987 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C @@ -65,7 +65,7 @@ tmp > snGradScheme::New ) << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl - << MeshConstructorTablePtr_->toc() + << MeshConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -83,7 +83,7 @@ tmp > snGradScheme::New ) << "Unknown discretisation scheme " << schemeName << endl << endl << "Valid schemes are :" << endl - << MeshConstructorTablePtr_->toc() + << MeshConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C index 8ae0c3b0d9..62c55633de 100644 --- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C @@ -50,7 +50,7 @@ Foam::autoPtr Foam::fvPatch::New FatalErrorIn("fvPatch::New(const polyPatch&, const fvBoundaryMesh&)") << "Unknown fvPatch type " << patch.type() << ".\n" << "Valid fvPatch types are :" - << polyPatchConstructorTablePtr_->toc() + << polyPatchConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C b/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C index 377815ea9a..cf6827a10f 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C +++ b/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C @@ -50,7 +50,7 @@ Foam::interpolation::New ) << "Unknown interpolation type " << interpolationType << " for field " << psi.name() << nl << nl << "Valid interpolation types : " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C index 77b18ab806..2d5b9dfcb9 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C @@ -62,7 +62,7 @@ limitedSurfaceInterpolationScheme::New ) << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl - << MeshConstructorTablePtr_->toc() + << MeshConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -81,7 +81,7 @@ limitedSurfaceInterpolationScheme::New ) << "Unknown discretisation scheme " << schemeName << endl << endl << "Valid schemes are :" << endl - << MeshConstructorTablePtr_->toc() + << MeshConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -117,7 +117,7 @@ limitedSurfaceInterpolationScheme::New ) << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl - << MeshConstructorTablePtr_->toc() + << MeshConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -136,7 +136,7 @@ limitedSurfaceInterpolationScheme::New ) << "Unknown discretisation scheme " << schemeName << endl << endl << "Valid schemes are :" << endl - << MeshFluxConstructorTablePtr_->toc() + << MeshFluxConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C index 5efc36af2f..a920dcb204 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C @@ -92,7 +92,7 @@ multivariateSurfaceInterpolationScheme::New schemeData ) << "unknown discretisation scheme " << schemeName << endl << endl << "Valid schemes are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C index 4702ccb5aa..9c43eeb48d 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C @@ -56,7 +56,7 @@ tmp > surfaceInterpolationScheme::New ) << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl - << MeshConstructorTablePtr_->toc() + << MeshConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -83,7 +83,7 @@ tmp > surfaceInterpolationScheme::New ) << "Unknown discretisation scheme " << schemeName << endl << endl << "Valid schemes are :" << endl - << MeshConstructorTablePtr_->toc() + << MeshConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -110,7 +110,7 @@ tmp > surfaceInterpolationScheme::New ) << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl - << MeshConstructorTablePtr_->toc() + << MeshConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -138,7 +138,7 @@ tmp > surfaceInterpolationScheme::New ) << "Unknown discretisation scheme " << schemeName << endl << endl << "Valid schemes are :" << endl - << MeshFluxConstructorTablePtr_->toc() + << MeshFluxConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C index b794db4a43..50936f456a 100644 --- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C +++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C @@ -68,7 +68,7 @@ Foam::autoPtr Foam::motionDiffusivity::New ) << "Unknown diffusion type " << diffTypeName << endl << endl << "Valid diffusion types are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C index 511679af37..8607b8eab1 100644 --- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C +++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C @@ -74,7 +74,7 @@ Foam::autoPtr Foam::injectorType::New << injectorTypeName << ", constructor not in hash table" << endl << endl << " Valid injector types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return autoPtr(cstrIter()(t, dict)); diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C index 7a5cfdffe1..8d2d8ca99f 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C @@ -61,7 +61,7 @@ autoPtr atomizationModel::New << atomizationModelType << ", constructor not in hash table" << endl << endl << " Valid atomizationModel types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return autoPtr(cstrIter()(dict, sm)); diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C index 69f3c5fcf4..d0889443eb 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C @@ -62,7 +62,7 @@ autoPtr breakupModel::New << breakupModelType << ", constructor not in hash table" << endl << endl << " Valid breakupModel types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return autoPtr(cstrIter()(dict, sm)); diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C index 8f60f6dc4d..942ebafe8d 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C @@ -67,7 +67,7 @@ autoPtr collisionModel::New << ", constructor not in hash table" << endl << endl << " Valid collisionModel types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C index cf03049155..50d6cbce8a 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C @@ -62,7 +62,7 @@ autoPtr dispersionModel::New << dispersionModelType << ", constructor not in hash table" << endl << endl << " Valid dispersionModel types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return autoPtr(cstrIter()(dict, sm)); diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C index 7424851d62..6fed754f95 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C @@ -60,7 +60,7 @@ autoPtr 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 autoPtr(cstrIter()(dict)); diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C index ff94baf830..2d400a09d4 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C @@ -62,7 +62,7 @@ autoPtr evaporationModel::New << evaporationModelType << ", constructor not in hash table" << endl << endl << " Valid evaporationModel types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return autoPtr(cstrIter()(dict)); diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C index 4be6465c6d..308fbfa697 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C @@ -60,7 +60,7 @@ autoPtr heatTransferModel::New << heatTransferModelType << ", constructor not in hash table" << endl << endl << " Valid heatTransferModel types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return autoPtr(cstrIter()(dict)); diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C index 59940886c7..41758a8259 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C @@ -61,7 +61,7 @@ autoPtr injectorModel::New << injectorModelType << ", constructor not in hash table" << endl << endl << " Valid injectorModel types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return autoPtr(cstrIter()(dict, sm)); diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C index c4648bc90a..3274533b1d 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C @@ -61,7 +61,7 @@ autoPtr wallModel::New << wallModelType << ", constructor not in hash table" << endl << endl << " Valid wallModel types are :" << endl; - Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return autoPtr(cstrIter()(dict, U, sm)); diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C index 12c74f6697..e122b66eaa 100644 --- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C +++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C @@ -56,7 +56,7 @@ Foam::BinaryCollisionModel::New << BinaryCollisionModelType << ", constructor not in hash table" << nl << nl << " Valid BinaryCollisionModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr > diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C index bc1005bdaf..b94f08898b 100644 --- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C +++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C @@ -53,7 +53,7 @@ Foam::InflowBoundaryModel::New << InflowBoundaryModelType << ", constructor not in hash table" << nl << nl << " Valid InflowBoundaryModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C index 97197cd669..6320812427 100644 --- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C +++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C @@ -55,7 +55,7 @@ Foam::WallInteractionModel::New << WallInteractionModelType << ", constructor not in hash table" << nl << nl << " Valid WallInteractionModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C index db73158615..83cbd33d8a 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C +++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C @@ -55,7 +55,7 @@ Foam::IntegrationScheme::New ) << "Unknown IntegrationScheme type " << IntegrationSchemeTypeName << nl << nl << "Valid IntegrationScheme types are:" << nl - << dictionaryConstructorTablePtr_->toc() << nl + << dictionaryConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C index 3bed47c540..f55fcb1190 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C @@ -48,7 +48,7 @@ Foam::autoPtr > Foam::DataEntry::New << "Unknown DataEntry type " << DataEntryType << " for DataEntry " << entryName << ". Constructor not in hash table" << nl << nl << " Valid DataEntry types are:" << nl - << dictionaryConstructorTablePtr_->toc() << nl + << dictionaryConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C index 09717b8e86..35c748949b 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C @@ -58,7 +58,7 @@ Foam::DispersionModel::New << DispersionModelType << ", constructor not in hash table" << nl << nl << " Valid DispersionModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C index 6e1e80d3cd..2202079b8c 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C @@ -55,7 +55,7 @@ Foam::autoPtr > Foam::DragModel::New << DragModelType << ", constructor not in hash table" << nl << nl << " Valid DragModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C index c0926272c6..3f6464ac0f 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C @@ -56,7 +56,7 @@ Foam::InjectionModel::New << InjectionModelType << ", constructor not in hash table" << nl << nl << " Valid InjectionModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C index 83740bb684..20887aa230 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C @@ -57,7 +57,7 @@ Foam::PatchInteractionModel::New << PatchInteractionModelType << ", constructor not in hash table" << nl << nl << " Valid PatchInteractionModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C index 29c096b677..563ceebec2 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C @@ -56,7 +56,7 @@ Foam::PostProcessingModel::New << PostProcessingModelType << ", constructor not in hash table" << nl << nl << " Valid PostProcessingModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C index 81d338176c..1c9b9a11db 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C @@ -56,7 +56,7 @@ Foam::CompositionModel::New << CompositionModelType << ", constructor not in hash table" << nl << nl << " Valid CompositionModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << nl + << dictionaryConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C index 3b317c5b05..264b4b1226 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C @@ -56,7 +56,7 @@ Foam::PhaseChangeModel::New << PhaseChangeModelType << ", constructor not in hash table" << nl << nl << " Valid PhaseChangeModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C index cac0375b28..471fee8aab 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C @@ -57,7 +57,7 @@ Foam::DevolatilisationModel::New << DevolatilisationModelType << ", constructor not in hash table" << nl << nl << " Valid DevolatilisationModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C index 348bfa8a8c..807891d08e 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C @@ -57,7 +57,7 @@ Foam::SurfaceReactionModel::New << SurfaceReactionModelType << ", constructor not in hash table" << nl << nl << " Valid SurfaceReactionModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C index d5d4748c4d..235c9ae18c 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C @@ -56,7 +56,7 @@ Foam::HeatTransferModel::New << HeatTransferModelType << ", constructor not in hash table" << nl << nl << " Valid HeatTransferModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr >(cstrIter()(dict, owner)); diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C index ccbdb8c92e..a7cb8455db 100644 --- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C +++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C @@ -60,7 +60,7 @@ autoPtr energyScalingFunction::New ) << "Unknown energyScalingFunction type " << energyScalingFunctionTypeName << nl << nl << "Valid energyScalingFunctions are: " << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C index 2986a0e539..6123079583 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C @@ -56,7 +56,7 @@ autoPtr pairPotential::New ) << "Unknown pairPotential type " << pairPotentialTypeName << nl << nl << "Valid pairPotentials are: " << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C index 85c8a70359..a5b3ad6092 100644 --- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C +++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C @@ -60,7 +60,7 @@ autoPtr tetherPotential::New ) << "Unknown tetherPotential type " << tetherPotentialTypeName << nl << nl << "Valid tetherPotentials are: " << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C index f3c95afc91..c0138e86e8 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C +++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C @@ -163,7 +163,7 @@ Foam::autoPtr Foam::coordinateRotation::New ) << "Unknown coordinateRotation type " << rotType << nl << nl << "Valid coordinateRotation types are :" << nl << "[default: axes " << typeName_() << "]" - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C index 9a6ec2a0b4..0c0752eded 100644 --- a/src/meshTools/coordinateSystems/coordinateSystemNew.C +++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C @@ -66,7 +66,7 @@ Foam::autoPtr Foam::coordinateSystem::New ) << "Unknown coordinateSystem type " << coordType << nl << nl << "Valid coordinateSystem types are :" << nl << "[default: " << typeName_() << "]" - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -102,7 +102,7 @@ Foam::autoPtr Foam::coordinateSystem::New "constructing coordinateSystem" ) << "Unknown coordinateSystem type " << coordType << nl << nl << "Valid coordinateSystem types are :" << nl - << origRotationConstructorTablePtr_->toc() + << origRotationConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/meshTools/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurface/searchableSurface.C index 5ec2338844..ad687a1134 100644 --- a/src/meshTools/searchableSurface/searchableSurface.C +++ b/src/meshTools/searchableSurface/searchableSurface.C @@ -57,7 +57,7 @@ autoPtr searchableSurface::New ) << "Unknown searchableSurface type " << searchableSurfaceType << endl << endl << "Valid searchableSurface types : " << endl - << dictConstructorTablePtr_->toc() + << dictConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C index 199c47203e..63aff6fc83 100644 --- a/src/meshTools/sets/topoSetSource/topoSetSource.C +++ b/src/meshTools/sets/topoSetSource/topoSetSource.C @@ -60,7 +60,7 @@ autoPtr topoSetSource::New ) << "Unknown topoSetSource type " << topoSetSourceType << endl << endl << "Valid topoSetSource types : " << endl - << wordConstructorTablePtr_->toc() + << wordConstructorTablePtr_->sortedToc() << exit(FatalError); } @@ -89,7 +89,7 @@ autoPtr topoSetSource::New ) << "Unknown topoSetSource type " << topoSetSourceType << endl << endl << "Valid topoSetSource types : " << endl - << istreamConstructorTablePtr_->toc() + << istreamConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C index 152193313e..32f8d1ff98 100644 --- a/src/meshTools/sets/topoSets/topoSet.C +++ b/src/meshTools/sets/topoSets/topoSet.C @@ -64,7 +64,7 @@ autoPtr topoSet::New ) << "Unknown set type " << setType << endl << endl << "Valid set types : " << endl - << wordConstructorTablePtr_->toc() + << wordConstructorTablePtr_->sortedToc() << exit(FatalError); } @@ -95,7 +95,7 @@ autoPtr topoSet::New ) << "Unknown set type " << setType << endl << endl << "Valid set types : " << endl - << sizeConstructorTablePtr_->toc() + << sizeConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C b/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C index 0c58abc5b0..d5d8e4de10 100644 --- a/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C +++ b/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::calcType::New << " unknown calcType type " << calcTypeName << ", constructor not in hash table" << nl << nl << " Valid calcType selections are: " << nl - << dictionaryConstructorTablePtr_->toc() << nl + << dictionaryConstructorTablePtr_->sortedToc() << nl << abort(FatalError); } diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C index 7b6f08206f..8b1dbaa335 100644 --- a/src/sampling/sampledSet/sampledSet/sampledSet.C +++ b/src/sampling/sampledSet/sampledSet/sampledSet.C @@ -430,7 +430,7 @@ Foam::autoPtr Foam::sampledSet::New ) << "Unknown sample type " << sampleType << endl << endl << "Valid sample types : " << endl - << wordConstructorTablePtr_->toc() + << wordConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/sampling/sampledSet/writers/writer.C b/src/sampling/sampledSet/writers/writer.C index 3a116b564e..b16966d3a1 100644 --- a/src/sampling/sampledSet/writers/writer.C +++ b/src/sampling/sampledSet/writers/writer.C @@ -49,7 +49,7 @@ Foam::autoPtr > Foam::writer::New ) << "Unknown write type " << writeType << endl << endl << "Valid write types : " << endl - << wordConstructorTablePtr_->toc() + << wordConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C index 5cbe630486..4f372a49b5 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C @@ -141,7 +141,7 @@ Foam::sampledSurface::New ) << "Unknown sample type " << sampleType << endl << endl << "Valid sample types : " << endl - << wordConstructorTablePtr_->toc() + << wordConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C index 99e19b96dd..a78ecbd21f 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.C +++ b/src/sampling/sampledSurface/writers/surfaceWriter.C @@ -77,7 +77,7 @@ Foam::surfaceWriter::New(const word& writeType) "surfaceWriter::New(const word&)" ) << "Unknown write type \"" << writeType << "\"\n\n" << "Valid write types : " - << wordConstructorTablePtr_->toc() << nl + << wordConstructorTablePtr_->sortedToc() << nl << "Valid proxy types : " << MeshedSurfaceProxy::writeTypes() << endl << exit(FatalError); diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C index 3ebc3c6532..77f6592775 100644 --- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C +++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C @@ -55,7 +55,7 @@ Foam::barotropicCompressibilityModel::New ) << "Unknown barotropicCompressibilityModel type " << bcModelTypeName << endl << endl << "Valid barotropicCompressibilityModels are : " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C index 3f9c43a0f9..038ac2e843 100644 --- a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C +++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C @@ -64,7 +64,7 @@ Foam::autoPtr Foam::basicPsiThermo::New FatalErrorIn("basicPsiThermo::New(const fvMesh&)") << "Unknown basicPsiThermo type " << thermoTypeName << nl << nl << "Valid basicPsiThermo types are:" << nl - << fvMeshConstructorTablePtr_->toc() << nl + << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C index 9a7ec5ac86..46eeed365c 100644 --- a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C +++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C @@ -67,7 +67,7 @@ Foam::autoPtr Foam::basicRhoThermo::New FatalErrorIn("basicRhoThermo::New(const fvMesh&)") << "Unknown basicRhoThermo type " << thermoTypeName << nl << nl << "Valid basicRhoThermo types are:" << nl - << fvMeshConstructorTablePtr_->toc() << nl + << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C index 6a5606d0e7..a7f6ed9a50 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C @@ -86,11 +86,11 @@ Foam::autoPtr Foam::psiChemistryModel::New FatalErrorIn("psiChemistryModelBase::New(const mesh&)") << "Unknown psiChemistryModel type " << psiChemistryModelType << nl << nl << "Valid psiChemistryModel types are:" << nl - << fvMeshConstructorTablePtr_->toc() << nl << exit(FatalError); + << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } else { - wordList models = fvMeshConstructorTablePtr_->toc(); + wordList models = fvMeshConstructorTablePtr_->sortedToc(); forAll(models, i) { models[i] = models[i].replace(typeName + ',', ""); diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C index c59a607f87..0fdad4e0a0 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C @@ -86,11 +86,11 @@ Foam::autoPtr Foam::rhoChemistryModel::New FatalErrorIn("rhoChemistryModelBase::New(const mesh&)") << "Unknown rhoChemistryModel type " << rhoChemistryModelType << nl << nl << "Valid rhoChemistryModel types are:" << nl - << fvMeshConstructorTablePtr_->toc() << nl << exit(FatalError); + << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } else { - wordList models = fvMeshConstructorTablePtr_->toc(); + wordList models = fvMeshConstructorTablePtr_->sortedToc(); forAll(models, i) { models[i] = models[i].replace(typeName + ',', ""); diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C index b0baa00fbe..e8f4b74495 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C @@ -49,7 +49,7 @@ Foam::chemistrySolver::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - wordList models = dictionaryConstructorTablePtr_->toc(); + wordList models = dictionaryConstructorTablePtr_->sortedToc(); forAll(models, i) { models[i] = models[i].replace diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C index 685f1d7e4f..e44f40c4c9 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C +++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C @@ -66,7 +66,7 @@ Foam::autoPtr Foam::laminarFlameSpeed::New ) << "Unknown laminarFlameSpeed type " << laminarFlameSpeedType << endl << endl << "Valid laminarFlameSpeed types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/thermophysicalModels/liquids/liquid/liquid.C b/src/thermophysicalModels/liquids/liquid/liquid.C index c2b5f8b3fa..542a215ff0 100644 --- a/src/thermophysicalModels/liquids/liquid/liquid.C +++ b/src/thermophysicalModels/liquids/liquid/liquid.C @@ -64,7 +64,7 @@ Foam::autoPtr Foam::liquid::New(Istream& is) << "Unknown liquid type " << liquidType << nl << nl << "Valid liquid types are:" << nl - << ConstructorTablePtr_->toc() + << ConstructorTablePtr_->sortedToc() << abort(FatalError); } @@ -81,7 +81,7 @@ Foam::autoPtr Foam::liquid::New(Istream& is) << "Unknown liquid type " << liquidType << endl << endl << "Valid liquid types are:" << nl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << abort(FatalError); } diff --git a/src/thermophysicalModels/pdfs/pdf/newPdf.C b/src/thermophysicalModels/pdfs/pdf/newPdf.C index ce13e261fb..5a3b077d21 100644 --- a/src/thermophysicalModels/pdfs/pdf/newPdf.C +++ b/src/thermophysicalModels/pdfs/pdf/newPdf.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::pdf::New FatalErrorIn("pdf::New(const dictionary&, Random&)") << "unknown pdf type " << pdfType << nl << nl << "Valid pdf types are:" << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C index c7840d9433..a5c27adac8 100644 --- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C +++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C @@ -76,7 +76,7 @@ autoPtr radiationModel::New ) << "Unknown radiationModel type " << radiationModelTypeName << nl << nl << "Valid radiationModel types are:" << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C index d1628fd8d4..3ce41d3750 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C @@ -53,7 +53,7 @@ Foam::radiation::absorptionEmissionModel::New << absorptionEmissionModelType << ", constructor not in hash table" << nl << nl << " Valid absorptionEmissionModel types are :" << nl - << dictionaryConstructorTablePtr_->toc() << exit(FatalError); + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } return autoPtr(cstrIter()(dict, mesh)); diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C index e1f545758a..82b451ae20 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C @@ -51,7 +51,7 @@ Foam::autoPtr Foam::radiation::scatterModel::New << scatterModelType << ", constructor not in hash table" << nl << nl << " Valid scatterModel types are :" << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C index e178bd0338..931706484b 100644 --- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C +++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C @@ -55,7 +55,7 @@ Foam::chemistryReader::New ) << "Unknown chemistryReader type " << chemistryReaderTypeName << nl << nl << "Valid chemistryReaders are: " << nl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C index 788a298d0d..b36172963c 100644 --- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C +++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C @@ -67,7 +67,7 @@ Foam::autoPtr Foam::hCombustionThermo::New << "Unknown hCombustionThermo type " << hCombustionThermoTypeName << nl << nl << "Valid hCombustionThermo types are:" << nl - << fvMeshConstructorTablePtr_->toc() << nl + << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } @@ -103,7 +103,7 @@ Foam::autoPtr Foam::hCombustionThermo::NewType if (hCombustionThermoTypeName.find(thermoType) == string::npos) { - wordList allModels = fvMeshConstructorTablePtr_->toc(); + wordList allModels = fvMeshConstructorTablePtr_->sortedToc(); DynamicList validModels; forAll(allModels, i) { @@ -140,7 +140,7 @@ Foam::autoPtr Foam::hCombustionThermo::NewType << "Unknown hCombustionThermo type " << hCombustionThermoTypeName << nl << nl << "Valid hCombustionThermo types are:" << nl - << fvMeshConstructorTablePtr_->toc() << nl + << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C index 2e21f2d9c5..4945cc8815 100644 --- a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C +++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C @@ -69,7 +69,7 @@ autoPtr hhuCombustionThermo::New(const fvMesh& mesh) << "Unknown hhuCombustionThermo type " << hhuCombustionThermoTypeName << endl << endl << "Valid hhuCombustionThermo types are :" << endl - << fvMeshConstructorTablePtr_->toc() + << fvMeshConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C index 688b37b6d2..ad0c92f04f 100644 --- a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C +++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C @@ -67,7 +67,7 @@ Foam::autoPtr Foam::hReactionThermo::New << "Unknown hReactionThermo type " << hReactionThermoTypeName << nl << nl << "Valid hReactionThermo types are:" << nl - << fvMeshConstructorTablePtr_->toc() << nl + << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } @@ -103,7 +103,7 @@ Foam::autoPtr Foam::hReactionThermo::NewType if (hReactionThermoTypeName.find(thermoType) == string::npos) { - wordList allModels = fvMeshConstructorTablePtr_->toc(); + wordList allModels = fvMeshConstructorTablePtr_->sortedToc(); DynamicList validModels; forAll(allModels, i) { @@ -140,7 +140,7 @@ Foam::autoPtr Foam::hReactionThermo::NewType << "Unknown hReactionThermo type " << hReactionThermoTypeName << nl << nl << "Valid hReactionThermo types are:" << nl - << fvMeshConstructorTablePtr_->toc() << nl + << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError); } diff --git a/src/thermophysicalModels/solids/solid/newSolid.C b/src/thermophysicalModels/solids/solid/newSolid.C index 445a98a00d..63cf5c22af 100644 --- a/src/thermophysicalModels/solids/solid/newSolid.C +++ b/src/thermophysicalModels/solids/solid/newSolid.C @@ -51,7 +51,7 @@ Foam::autoPtr Foam::solid::New(Istream& is) FatalErrorIn("solid::New(Istream&)") << "Unknown solid type " << solidType << nl << nl << "Valid solid types are:" << endl - << ConstructorTablePtr_->toc() + << ConstructorTablePtr_->sortedToc() << exit(FatalError); } @@ -67,7 +67,7 @@ Foam::autoPtr Foam::solid::New(Istream& is) FatalErrorIn("solid::New(Istream&)") << "Unknown solid type " << solidType << nl << nl << "Valid solid types are:" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index f0ebd1c61a..ad5c2e1185 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -228,7 +228,7 @@ autoPtr > Reaction::New is ) << "Reaction type not specified" << endl << endl << "Valid Reaction types are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } @@ -246,7 +246,7 @@ autoPtr > Reaction::New is ) << "Unknown reaction type " << reactionTypeName << endl << endl << "Valid reaction types are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); } diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C index 7eda81bb2b..7cf74b659e 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C +++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C @@ -62,7 +62,7 @@ autoPtr thermophysicalFunction::New(Istream& is) << thermophysicalFunctionType << endl << endl << "Valid thermophysicalFunction types are :" << endl - << IstreamConstructorTablePtr_->toc() + << IstreamConstructorTablePtr_->sortedToc() << abort(FatalError); } diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C index fd7aa5183d..aeba455a8d 100644 --- a/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C +++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C @@ -60,7 +60,7 @@ autoPtr viscosityModel::New ) << "Unknown viscosityModel type " << viscosityModelTypeName << endl << endl << "Valid viscosityModels are : " << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C index 5f4283859a..54a73b1243 100644 --- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C +++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C @@ -80,7 +80,7 @@ autoPtr LESdelta::New "LESdelta::New(const fvMesh&, const dictionary&)" ) << "Unknown LESdelta type " << deltaType << endl << endl << "Valid LESdelta types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C index e77e00f189..ba60f21e4c 100644 --- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C +++ b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C @@ -59,7 +59,7 @@ autoPtr LESfilter::New "LESfilter::New(const fvMesh&, const dictionary&)" ) << "Unknown LESfilter type " << filterType << endl << endl << "Valid LESfilter types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C index dd166f2693..c32cb077d8 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C @@ -136,7 +136,7 @@ autoPtr LESModel::New ) << "Unknown LESModel type " << modelName << endl << endl << "Valid LESModel types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index b390bca5e5..1d4054fb04 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -141,7 +141,7 @@ autoPtr RASModel::New ) << "Unknown RASModel type " << modelName << endl << endl << "Valid RASModel types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C index 15cce81cc1..8c544ddef9 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C +++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C @@ -106,7 +106,7 @@ autoPtr turbulenceModel::New ) << "Unknown turbulenceModel type " << modelName << endl << endl << "Valid turbulenceModel types are :" << endl - << turbulenceModelConstructorTablePtr_->toc() + << turbulenceModelConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C index 3458e03c6b..76c2ef0ba4 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -133,7 +133,7 @@ autoPtr LESModel::New ) << "Unknown LESModel type " << modelName << endl << endl << "Valid LESModel types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index d3366d8206..c2546e659e 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -138,7 +138,7 @@ autoPtr RASModel::New ) << "Unknown RASModel type " << modelName << endl << endl << "Valid RASModel types are :" << endl - << dictionaryConstructorTablePtr_->toc() + << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C index cdbb61fa70..2cc9c9462a 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C @@ -102,7 +102,7 @@ autoPtr turbulenceModel::New ) << "Unknown turbulenceModel type " << modelName << endl << endl << "Valid turbulenceModel types are :" << endl - << turbulenceModelConstructorTablePtr_->toc() + << turbulenceModelConstructorTablePtr_->sortedToc() << exit(FatalError); } From a7c5d31c3eb927b80b74f4aaf4fa3a5efca02e31 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 6 Aug 2009 19:24:22 +0100 Subject: [PATCH 5/5] typo --- src/dynamicMesh/meshCut/directions/directions.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H index 11b06f1f44..9debd4b210 100644 --- a/src/dynamicMesh/meshCut/directions/directions.H +++ b/src/dynamicMesh/meshCut/directions/directions.H @@ -74,7 +74,7 @@ public: { TAN1, TAN2, - NORMAL, + NORMAL }; private: