Removed "<modelType>Type type" tautology in selection error messages

applications/modules/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C

@@ -46,7 +46,7 @@ Foam::aspectRatioModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown aspectRatioModelType type "
+            << "Unknown aspectRatioModel type "
             << aspectRatioModelType << endl << endl
             << "Valid aspectRatioModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C

@@ -48,7 +48,7 @@ Foam::diffusiveMassTransferModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown diffusiveMassTransferModelType type "
+            << "Unknown diffusiveMassTransferModel type "
             << diffusiveMassTransferModelType << endl << endl
             << "Valid diffusiveMassTransferModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C

@@ -50,7 +50,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown dragModelType type "
+            << "Unknown dragModel type "
             << dragModelType << endl << endl
             << "Valid dragModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C

@@ -50,7 +50,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown heatTransferModelType type "
+            << "Unknown heatTransferModel type "
             << heatTransferModelType << endl << endl
             << "Valid heatTransferModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C

@@ -52,7 +52,7 @@ Foam::interfaceCompositionModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown interfaceCompositionModelType type "
+            << "Unknown interfaceCompositionModel type "
             << interfaceCompositionModelType << endl << endl
             << "Valid interfaceCompositionModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C

@@ -52,7 +52,7 @@ Foam::interfaceSurfaceTensionModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown interfaceSurfaceTensionModelType type "
+            << "Unknown interfaceSurfaceTensionModel type "
             << interfaceSurfaceTensionModelType << endl << endl
             << "Valid interfaceSurfaceTensionModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C

@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown liftModelType type "
+            << "Unknown liftModel type "
             << liftModelType << endl << endl
             << "Valid liftModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C

@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::phaseTransferModel> Foam::phaseTransferModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown phaseTransferModelType type "
+            << "Unknown phaseTransferModel type "
             << phaseTransferModelType << endl << endl
             << "Valid phaseTransferModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C

@@ -46,7 +46,7 @@ Foam::swarmCorrection::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown swarmCorrectionType type "
+            << "Unknown swarmCorrection type "
             << swarmCorrectionType << endl << endl
             << "Valid swarmCorrection types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C

@@ -52,7 +52,7 @@ Foam::turbulentDispersionModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown turbulentDispersionModelType type "
+            << "Unknown turbulentDispersionModel type "
             << turbulentDispersionModelType << endl << endl
             << "Valid turbulentDispersionModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C

@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown virtualMassModelType type "
+            << "Unknown virtualMassModel type "
             << virtualMassModelType << endl << endl
             << "Valid virtualMassModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C

@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::wallDampingModel> Foam::wallDampingModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown wallDampingModelType type "
+            << "Unknown wallDampingModel type "
             << wallDampingModelType << endl << endl
             << "Valid wallDampingModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C

@@ -51,7 +51,7 @@ Foam::autoPtr<Foam::wallLubricationModel> Foam::wallLubricationModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown wallLubricationModelType type "
+            << "Unknown wallLubricationModel type "
             << wallLubricationModelType << endl << endl
             << "Valid wallLubricationModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C

@@ -43,13 +43,12 @@ Foam::kineticTheoryModels::conductivityModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalError
+        FatalErrorInFunction
-            << "conductivityModel::New(const dictionary&) : " << endl
+            << "Unknown granularConductivityModel type "
-            << "    unknown granularConductivityModel type "
+            << conductivityModelType << endl << endl
-            << conductivityModelType
+            << "Valid granularConductivityModel types are :" << endl
-            << ", constructor not in hash table" << endl << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
-            << "    Valid granularConductivityModel types are :" << endl;
+            << exit(FatalError);
-        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<conductivityModel>(cstrIter()(dict));

applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C

@@ -43,14 +43,12 @@ Foam::kineticTheoryModels::frictionalStressModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalError
+        FatalErrorInFunction
-            << "frictionalStressModel::New(const dictionary&) : " << endl
+            << "Unknown frictionalStressModel type "
-            << "    unknown frictionalStressModelType type "
+            << frictionalStressModelType << endl << endl
-            << frictionalStressModelType
+            << "Valid frictionalStressModel types are :" << endl
-            << ", constructor not in hash table" << endl << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
-            << "    Valid frictionalStressModelType types are :" << endl;
+            << exit(FatalError);
-        Info<< dictionaryConstructorTablePtr_->sortedToc()
-            << abort(FatalError);
     }
 
     return autoPtr<frictionalStressModel>(cstrIter()(dict));

applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C

@@ -43,14 +43,12 @@ Foam::kineticTheoryModels::granularPressureModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalError
+        FatalErrorInFunction
-            << "granularPressureModel::New(const dictionary&) : " << endl
+            << "Unknown granularPressureModel type "
-            << "    unknown granularPressureModelType type "
+            << granularPressureModelType << endl << endl
-            << granularPressureModelType
+            << "Valid granularPressureModel types are :" << endl
-            << ", constructor not in hash table" << endl << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
-            << "    Valid granularPressureModelType types are :" << endl;
+            << exit(FatalError);
-        Info<< dictionaryConstructorTablePtr_->sortedToc()
-            << abort(FatalError);
     }
 
     return autoPtr<granularPressureModel>(cstrIter()(dict));

applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C

@@ -43,14 +43,12 @@ Foam::kineticTheoryModels::radialModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalError
+        FatalErrorInFunction
-            << "radialModel::New(const dictionary&) : " << endl
+            << "Unknown radialModel type "
-            << "    unknown radialModelType type "
+            << radialModelType << endl << endl
-            << radialModelType
+            << "Valid radialModel types are :" << endl
-            << ", constructor not in hash table" << endl << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
-            << "    Valid radialModelType types are :" << endl;
+            << exit(FatalError);
-        Info<< dictionaryConstructorTablePtr_->sortedToc()
-            << abort(FatalError);
     }
 
     return autoPtr<radialModel>(cstrIter()(dict));

applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C

@@ -43,13 +43,12 @@ Foam::kineticTheoryModels::viscosityModel::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalError
+        FatalErrorInFunction
-            << "viscosityModel::New(const dictionary&) : " << endl
+            << "Unknown granularViscosityModel type "
-            << "    unknown granularViscosityModel type "
+            << viscosityModelType << endl << endl
-            << viscosityModelType
+            << "Valid granularViscosityModel types are :" << endl
-            << ", constructor not in hash table" << endl << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
-            << "    Valid granularViscosityModel types are :" << endl;
+            << exit(FatalError);
-        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<viscosityModel>(cstrIter()(dict));

applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C

@@ -45,7 +45,7 @@ Foam::autoPtr<Foam::blendingMethod> Foam::blendingMethod::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown blendingMethodType type "
+            << "Unknown blendingMethod type "
             << blendingMethodType << endl << endl
             << "Valid blendingMethod types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/phaseSystem/diameterModels/diameterModel/diameterModelNew.C

@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-           << "Unknown diameterModelType type "
+           << "Unknown diameterModel type "
            << diameterModelType << endl << endl
            << "Valid diameterModel types are : " << endl
            << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/phaseSystem/phaseModel/phaseModelNew.C

@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
     if (cstrIter == phaseSystemConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown phaseModelType type "
+            << "Unknown phaseModel type "
             << phaseModelType << endl << endl
             << "Valid phaseModel types are : " << endl
             << phaseSystemConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemNew.C

@@ -57,7 +57,7 @@ Foam::autoPtr<Foam::phaseSystem> Foam::phaseSystem::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown phaseSystemType type "
+            << "Unknown phaseSystem type "
             << phaseSystemType << endl << endl
             << "Valid phaseSystem types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C

@@ -63,7 +63,7 @@ Foam::diameterModels::shapeModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown shapeModelType type "
+            << "Unknown shapeModel type "
             << shapeModelType << endl << endl
             << "Valid shapeModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C

@@ -44,7 +44,7 @@ Foam::wallBoilingModels::departureDiameterModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown departureDiameterModelType type "
+            << "Unknown departureDiameterModel type "
             << departureDiameterModelType << endl << endl
             << "Valid departureDiameterModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C

@@ -44,7 +44,7 @@ Foam::wallBoilingModels::departureFrequencyModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown departureFrequencyModelType type "
+            << "Unknown departureFrequencyModel type "
             << departureFrequencyModelType << endl << endl
             << "Valid departureFrequencyModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C

@@ -44,7 +44,7 @@ Foam::wallBoilingModels::nucleationSiteModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown nucleationSiteModelType type "
+            << "Unknown nucleationSiteModel type "
             << nucleationSiteModelType << endl << endl
             << "Valid nucleationSiteModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C

@@ -44,7 +44,7 @@ Foam::wallBoilingModels::partitioningModel::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown partitioningModelType type "
+            << "Unknown partitioningModel type "
             << partitioningModelType << endl << endl
             << "Valid partitioningModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ Foam::autoPtr<Foam::patchDistMethod> Foam::patchDistMethod::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown patchDistMethodType type "
+            << "Unknown patchDistMethod type "
             << patchDistMethodType << endl << endl
             << "Valid patchDistMethod types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

src/lagrangian/parcel/submodels/Momentum/CollisionModel/CollisionModel/CollisionModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::CollisionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word modelType(dict.lookup("collisionModel"));
+    const word modelType(dict.lookup("collisionModel"));
 
     Info<< "Selecting collision model " << modelType << endl;
 
@@ -45,10 +45,11 @@ Foam::CollisionModel<CloudType>::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown collision model type " << modelType
+            << "Unknown collision model type "
-            << ", constructor not in hash table" << nl << nl
+            << modelType << nl << nl
-            << "    Valid collision model types are:" << nl
+            << "Valid collision model types are:" << nl
-            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<CollisionModel<CloudType>>(cstrIter()(dict, owner));

src/lagrangian/parcel/submodels/Momentum/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,21 +35,21 @@ Foam::PairModel<CloudType>::New
     CloudType& owner
 )
 {
-    word PairModelType(dict.lookup("pairModel"));
+    const word pairModelType(dict.lookup("pairModel"));
 
-    Info<< "Selecting pair model " << PairModelType << endl;
+    Info<< "Selecting pair model " << pairModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(PairModelType);
+        dictionaryConstructorTablePtr_->find(pairModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
             << "Unknown pair model type "
-            << PairModelType
+            << pairModelType << nl << nl
-            << ", constructor not in hash table" << nl << nl
+            << "Valid pair model types are:" << nl
-            << "    Valid pair model types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
-            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+            << exit(FatalError);
     }
 
     return autoPtr<PairModel<CloudType>>(cstrIter()(dict, owner));

src/lagrangian/parcel/submodels/Momentum/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,20 +35,21 @@ Foam::WallModel<CloudType>::New
     CloudType& owner
 )
 {
-    word WallModelType(dict.lookup("wallModel"));
+    const word wallModelType(dict.lookup("wallModel"));
 
-    Info<< "Selecting wall model " << WallModelType << endl;
+    Info<< "Selecting wall model " << wallModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(WallModelType);
+        dictionaryConstructorTablePtr_->find(wallModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown wall model type type " << WallModelType
+            << "Unknown wall model type "
-            << ", constructor not in hash table" << nl << nl
+            << wallModelType << nl << nl
-            << "    Valid wall model types are:" << nl
+            << "Valid wall model types are:" << nl
-            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<WallModel<CloudType>>(cstrIter()(dict, owner));

src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,8 @@ Foam::InjectionModel<CloudType>::New
             << "Unknown injection model type "
             << modelType << nl << nl
             << "Valid injection model types are:" << nl
-            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<InjectionModel<CloudType>>(cstrIter()(dict, owner));

src/lagrangian/parcel/submodels/Momentum/ParticleForces/ParticleForce/ParticleForceNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,7 @@ Foam::ParticleForce<CloudType>::New
 )
 {
     word forceType = name;
+
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(forceType);
 
@@ -53,9 +54,8 @@ Foam::ParticleForce<CloudType>::New
     {
         FatalErrorInFunction
             << "Unknown particle force type "
-            << forceType
+            << forceType << nl << nl
-            << ", constructor not in hash table" << nl << nl
+            << "Valid particle force types are:" << nl
-            << "    Valid particle force types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }

src/lagrangian/parcel/submodels/Momentum/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Foam::StochasticCollisionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word modelType(dict.lookup("stochasticCollisionModel"));
+    const word modelType(dict.lookup("stochasticCollisionModel"));
 
     Info<< "Selecting stochastic collision model " << modelType << endl;
 
@@ -45,10 +45,11 @@ Foam::StochasticCollisionModel<CloudType>::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown model type type "
+            << "Unknown stochastic collision model type "
-            << modelType << ", constructor not in hash table" << nl << nl
+            << modelType << nl << nl
-            << "    Valid model types are:" << nl
+            << "Valid model types are:" << nl
-            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
     }
 
     return autoPtr<StochasticCollisionModel<CloudType>>

src/lagrangian/parcel/submodels/Spray/AtomisationModel/AtomisationModel/AtomisationModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,21 +35,21 @@ Foam::AtomisationModel<CloudType>::New
     CloudType& owner
 )
 {
-    word AtomisationModelType(dict.lookup("atomisationModel"));
+    const word atomisationModelType(dict.lookup("atomisationModel"));
 
-    Info<< "Selecting AtomisationModel " << AtomisationModelType << endl;
+    Info<< "Selecting atomisation model " << atomisationModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(AtomisationModelType);
+        dictionaryConstructorTablePtr_->find(atomisationModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown AtomisationModelType type "
+            << "Unknown atomisation model type "
-            << AtomisationModelType
+            << atomisationModelType << nl << nl
-            << ", constructor not in hash table" << nl << nl
+            << "Valid atomisation model types are:" << nl
-            << "    Valid AtomisationModel types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
-            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+            << exit(FatalError);
     }
 
     return autoPtr<AtomisationModel<CloudType>>(cstrIter()(dict, owner));

src/lagrangian/parcel/submodels/Spray/BreakupModel/BreakupModel/BreakupModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,21 +35,21 @@ Foam::BreakupModel<CloudType>::New
     CloudType& owner
 )
 {
-    word BreakupModelType(dict.lookup("breakupModel"));
+    const word breakupModelType(dict.lookup("breakupModel"));
 
-    Info<< "Selecting BreakupModel " << BreakupModelType << endl;
+    Info<< "Selecting breakup model " << breakupModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(BreakupModelType);
+        dictionaryConstructorTablePtr_->find(breakupModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown BreakupModelType type "
+            << "Unknown breakup model type "
-            << BreakupModelType
+            << breakupModelType << nl << nl
-            << ", constructor not in hash table" << nl << nl
+            << "Valid breakup model types are:" << nl
-            << "    Valid BreakupModel types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
-            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+            << exit(FatalError);
     }
 
     return autoPtr<BreakupModel<CloudType>>(cstrIter()(dict, owner));

src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::RBD::rigidBodySolver> Foam::RBD::rigidBodySolver::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown rigidBodySolverType type "
+            << "Unknown rigidBodySolver type "
             << rigidBodySolverType << endl << endl
             << "Valid rigidBodySolver types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolverNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::sixDoFSolver> Foam::sixDoFSolver::New
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
-            << "Unknown sixDoFSolverType type "
+            << "Unknown sixDoFSolver type "
             << sixDoFSolverType << endl << endl
             << "Valid sixDoFSolver types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()

src/twoPhaseModels/interfaceProperties/contactAngleModels/contactAngleModel/contactAngleModelNew.C

@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::contactAngleModel> Foam::contactAngleModel::New
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
             FatalErrorInFunction
-                << "Unknown contactAngleModelType type "
+                << "Unknown contactAngleModel type "
                 << contactAngleModelType << endl << endl
                 << "Valid contactAngleModel types are : " << endl
                 << dictionaryConstructorTablePtr_->sortedToc()

src/twoPhaseModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::surfaceTensionModel> Foam::surfaceTensionModel::New
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
             FatalErrorInFunction
-                << "Unknown surfaceTensionModelType type "
+                << "Unknown surfaceTensionModel type "
                 << surfaceTensionModelType << endl << endl
                 << "Valid surfaceTensionModel types are : " << endl
                 << dictionaryConstructorTablePtr_->sortedToc()