zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Will Bainbridge
2023-11-28 16:25:27 +00:00
parent 01d0af39be
commit f6f55caf02
40 changed files with 117 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/modules/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C
View File

@ -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()

13
applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C
View File

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

14
applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C
View File

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

14
applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C
View File

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

14
applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C
View File

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

13
applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C
View File

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

2
applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/phaseSystem/diameterModels/diameterModel/diameterModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/phaseSystem/phaseModel/phaseModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemNew.C
View File

@ -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()

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

@ -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()

2
applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C
View File

@ -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()

2
applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C
View File

@ -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()

4
src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
View File

@ -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()

13
src/lagrangian/parcel/submodels/Momentum/CollisionModel/CollisionModel/CollisionModelNew.C
View File

@ -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
<< ", constructor not in hash table" << nl << nl
<< " Valid collision model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
<< "Unknown collision model type "
<< modelType << nl << nl
<< "Valid collision model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<CollisionModel<CloudType>>(cstrIter()(dict, owner));

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

@ -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
<< ", constructor not in hash table" << nl << nl
<< " Valid pair model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
<< pairModelType << nl << nl
<< "Valid pair model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<PairModel<CloudType>>(cstrIter()(dict, owner));

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

@ -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
<< ", constructor not in hash table" << nl << nl
<< " Valid wall model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
<< "Unknown wall model type "
<< wallModelType << nl << nl
<< "Valid wall model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<WallModel<CloudType>>(cstrIter()(dict, owner));

5
src/lagrangian/parcel/submodels/Momentum/InjectionModel/InjectionModel/InjectionModelNew.C
View File

@ -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));

8
src/lagrangian/parcel/submodels/Momentum/ParticleForces/ParticleForce/ParticleForceNew.C
View File

@ -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
<< ", constructor not in hash table" << nl << nl
<< " Valid particle force types are:" << nl
<< forceType << nl << nl
<< "Valid particle force types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}

13
src/lagrangian/parcel/submodels/Momentum/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C
View File

@ -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 "
<< modelType << ", constructor not in hash table" << nl << nl
<< " Valid model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
<< "Unknown stochastic collision model type "
<< modelType << nl << nl
<< "Valid model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<StochasticCollisionModel<CloudType>>

18
src/lagrangian/parcel/submodels/Spray/AtomisationModel/AtomisationModel/AtomisationModelNew.C
View File

@ -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 "
<< AtomisationModelType
<< ", constructor not in hash table" << nl << nl
<< " Valid AtomisationModel types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
<< "Unknown atomisation model type "
<< atomisationModelType << nl << nl
<< "Valid atomisation model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<AtomisationModel<CloudType>>(cstrIter()(dict, owner));

18
src/lagrangian/parcel/submodels/Spray/BreakupModel/BreakupModel/BreakupModelNew.C
View File

@ -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 "
<< BreakupModelType
<< ", constructor not in hash table" << nl << nl
<< " Valid BreakupModel types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
<< "Unknown breakup model type "
<< breakupModelType << nl << nl
<< "Valid breakup model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<BreakupModel<CloudType>>(cstrIter()(dict, owner));

4
src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/rigidBodySolverNew.C
View File

@ -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()

4
src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/sixDoFSolverNew.C
View File

@ -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()

2
src/twoPhaseModels/interfaceProperties/contactAngleModels/contactAngleModel/contactAngleModelNew.C
View File

@ -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()

4
src/twoPhaseModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
View File

@ -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()