diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C index 3570aebd80..6a6581182b 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C @@ -43,7 +43,7 @@ Foam::autoPtr Foam::PDRDragModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown PDRDragModel type " diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C index 82411751fb..932080e717 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::XiEqModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown XiEqModel type " diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C index 0d7f1afcfb..27fe3f5e17 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::XiGModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown XiGModel type " diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C index a317eb50ec..ed9dfb2fb3 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C @@ -45,7 +45,7 @@ Foam::autoPtr Foam::XiModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown XiModel type " diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C index b36e3f6e77..99c33123e8 100644 --- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C +++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::mixtureViscosityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown mixtureViscosityModel type " diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C index b6e7fbae00..c671c223db 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C @@ -111,7 +111,7 @@ Foam::autoPtr Foam::relativeVelocityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown time scale model type " << modelType diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C index 88497f6222..e4d71d2397 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C @@ -63,7 +63,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New componentsConstructorTablePtr_ ->find(temperaturePhaseChangeTwoPhaseMixtureTypeName); - if (cstrIter == componentsConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown temperaturePhaseChangeTwoPhaseMixture type " diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C index 0825368e5c..c14fa08d59 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C @@ -60,7 +60,7 @@ Foam::phaseChangeTwoPhaseMixture::New componentsConstructorTablePtr_ ->find(phaseChangeTwoPhaseMixtureTypeName); - if (cstrIter == componentsConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown phaseChangeTwoPhaseMixture type " diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index 3bdd49ec7a..b880c4a6d3 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::dragModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(dragModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown dragModelType type " diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index deabfc900f..b43d46f8a3 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -48,7 +48,7 @@ Foam::autoPtr Foam::heatTransferModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(heatTransferModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown heatTransferModelType type " diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C index b58f00291b..51e7407882 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::diameterModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(diameterModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown diameterModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C index 16b3055687..fee1253108 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C @@ -52,7 +52,7 @@ Foam::interfaceCompositionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(interfaceCompositionModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown interfaceCompositionModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C index 1251c98fe0..3b349be693 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::massTransferModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(massTransferModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown massTransferModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C index 920d7c62c8..17fc43cac4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C @@ -40,7 +40,7 @@ Foam::autoPtr Foam::saturationModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(saturationModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown saturationModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C index 82359c0508..f14c0da92f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C @@ -43,7 +43,7 @@ Foam::surfaceTensionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(surfaceTensionModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown surfaceTensionModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C index 568c1b2682..2946810cf5 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C @@ -43,7 +43,7 @@ Foam::aspectRatioModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(aspectRatioModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown aspectRatioModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index e077e31b2d..c2a5f4074e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::dragModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(dragModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown dragModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index 8cdb07f297..46e43f6b11 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::heatTransferModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(heatTransferModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown heatTransferModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C index 3da4caee7c..8dbdd5479c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::liftModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(liftModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown liftModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C index a7181b4396..fb16d05418 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C @@ -43,7 +43,7 @@ Foam::swarmCorrection::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(swarmCorrectionType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown swarmCorrectionType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C index e440e3d1ee..53266ae6b2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C @@ -43,7 +43,7 @@ Foam::turbulentDispersionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(turbulentDispersionModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown turbulentDispersionModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C index 4c4ced9ddc..1b092c197e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::virtualMassModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(virtualMassModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown virtualMassModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C index a5b0748679..83ad7b42e5 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::wallDampingModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(wallDampingModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown wallDampingModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C index 08dfd7065d..806a1dd3b3 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::wallLubricationModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(wallLubricationModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown wallLubricationModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C index e288235568..cbb33a5fbd 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::blendingMethod::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(blendingMethodType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown blendingMethodType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C index b58f00291b..51e7407882 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::diameterModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(diameterModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown diameterModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C index 6c1ca526db..c42b86070d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C @@ -43,7 +43,7 @@ Foam::autoPtr Foam::phaseModel::New phaseSystemConstructorTable::iterator cstrIter = phaseSystemConstructorTablePtr_->find(phaseModelType); - if (cstrIter == phaseSystemConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown phaseModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C index 7ee24aa1aa..0f116c7040 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C @@ -54,7 +54,7 @@ Foam::autoPtr Foam::multiphaseSystem::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(multiphaseSystemType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown multiphaseSystemType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C index 45301ef6f8..dcc0cc0d0f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C @@ -41,7 +41,7 @@ Foam::wallBoilingModels::departureDiameterModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(departureDiameterModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown departureDiameterModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C index 4902b32915..13987ff4b0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C @@ -41,7 +41,7 @@ Foam::wallBoilingModels::departureFrequencyModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(departureFrequencyModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown departureFrequencyModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C index 486597787d..32f2d5a520 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C @@ -41,7 +41,7 @@ Foam::wallBoilingModels::nucleationSiteModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(nucleationSiteModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown nucleationSiteModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C index adfa944c9d..6cf6d1d64c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C @@ -41,7 +41,7 @@ Foam::wallBoilingModels::partitioningModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(partitioningModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown partitioningModelType type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C index a878a09773..bfadfc6399 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::conductivityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(conductivityModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "conductivityModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C index db6102174a..b68c03470f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(frictionalStressModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "frictionalStressModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C index 36b2c2b175..a1ce25337f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::granularPressureModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(granularPressureModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "granularPressureModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C index 65f6c9ebb8..583ce1c3ad 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::radialModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(radialModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "radialModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C index e79cbde0c1..361850b414 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::viscosityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(viscosityModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "viscosityModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index dd110902b1..dfbd95e6b2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C @@ -53,7 +53,7 @@ Foam::diameterModels::IATEsource::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(type); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown IATE source type " diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C index 5477ae7c58..c2ca635873 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C @@ -54,7 +54,7 @@ Foam::autoPtr Foam::twoPhaseSystem::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(twoPhaseSystemType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown twoPhaseSystemType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C index 568c1b2682..2946810cf5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C @@ -43,7 +43,7 @@ Foam::aspectRatioModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(aspectRatioModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown aspectRatioModelType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index e077e31b2d..c2a5f4074e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::dragModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(dragModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown dragModelType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index 8cdb07f297..46e43f6b11 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::heatTransferModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(heatTransferModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown heatTransferModelType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C index 3da4caee7c..8dbdd5479c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::liftModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(liftModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown liftModelType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C index a7181b4396..fb16d05418 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C @@ -43,7 +43,7 @@ Foam::swarmCorrection::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(swarmCorrectionType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown swarmCorrectionType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C index e440e3d1ee..53266ae6b2 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C @@ -43,7 +43,7 @@ Foam::turbulentDispersionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(turbulentDispersionModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown turbulentDispersionModelType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C index 4c4ced9ddc..1b092c197e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::virtualMassModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(virtualMassModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown virtualMassModelType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C index 08dfd7065d..806a1dd3b3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::wallLubricationModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(wallLubricationModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown wallLubricationModelType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C index a878a09773..bfadfc6399 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::conductivityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(conductivityModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "conductivityModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C index db6102174a..b68c03470f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(frictionalStressModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "frictionalStressModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C index 36b2c2b175..a1ce25337f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::granularPressureModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(granularPressureModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "granularPressureModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C index 65f6c9ebb8..583ce1c3ad 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::radialModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(radialModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "radialModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C index e79cbde0c1..361850b414 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C @@ -41,7 +41,7 @@ Foam::kineticTheoryModels::viscosityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(viscosityModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalError << "viscosityModel::New(const dictionary&) : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C index e288235568..cbb33a5fbd 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::blendingMethod::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(blendingMethodType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown blendingMethodType type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index 27fd28d68d..fc011ece0c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C @@ -54,7 +54,7 @@ Foam::diameterModels::IATEsource::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(type); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown IATE source type " diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C index b58f00291b..51e7407882 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::diameterModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(diameterModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown diameterModelType type " diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C index 4551fe2c6f..15604c8867 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C @@ -90,7 +90,7 @@ Foam::cellSizeAndAlignmentControl::New cellSizeAndAlignmentControlTypeName ); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown cellSizeAndAlignmentControl type " diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C index c0db55e558..f2f93f2412 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C @@ -133,7 +133,7 @@ Foam::autoPtr Foam::cellSizeFunction::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(cellSizeFunctionTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown cellSizeFunction type " diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C index 2e925b9b32..93aa04c5ab 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C @@ -71,7 +71,7 @@ Foam::autoPtr Foam::cellSizeCalculationType::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(cellSizeCalculationTypeTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown cellSizeCalculationType type " diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C index cac1837021..2740fc1193 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C @@ -75,7 +75,7 @@ Foam::autoPtr Foam::surfaceCellSizeFunction::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(surfaceCellSizeFunctionTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown surfaceCellSizeFunction type " diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C index 6388c0c6c8..2a6ccd8a39 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C @@ -68,7 +68,7 @@ autoPtr faceAreaWeightModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(faceAreaWeightModelTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown faceAreaWeightModel type " diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C index 1100784155..6a73347681 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C @@ -94,7 +94,7 @@ autoPtr initialPointsMethod::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(initialPointsMethodTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown initialPointsMethod type " diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C index e47cbf4aaa..8086470c6e 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C @@ -71,7 +71,7 @@ autoPtr relaxationModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(relaxationModelTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown relaxationModel type " diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C index 16dc56814d..b35c37df1a 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C @@ -48,7 +48,7 @@ Foam::searchableSurfaceFeatures::New dictConstructorTable::iterator cstrIter = dictConstructorTablePtr_->find(searchableSurfaceFeaturesType); - if (cstrIter == dictConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown searchableSurfaceFeatures type " diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C index 84a7cea3c1..dd66f694aa 100644 --- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C +++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C @@ -71,7 +71,7 @@ Foam::autoPtr Foam::faceSelection::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(sampleType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown faceSelection type " diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C index c6e45dd688..3feb5f8659 100644 --- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C +++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C @@ -37,7 +37,7 @@ Foam::autoPtr Foam::helpType::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(helpTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { // special treatment for -help // exit without stack trace diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C index 0c2c1a1924..b4d67de9e2 100644 --- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C +++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C @@ -47,7 +47,7 @@ autoPtr tabulatedWallFunction::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(twfTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown tabulatedWallFunction type " << twfTypeName diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C index d62fb05927..a3dc719dc8 100644 --- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C +++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C @@ -67,7 +67,7 @@ Foam::searchableSurfaceModifier::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(type); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown searchableSurfaceModifier type " diff --git a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C index 0774ac7de0..20d6bc8831 100644 --- a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C +++ b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C @@ -39,7 +39,7 @@ Foam::autoPtr Foam::ODESolver::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(ODESolverTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown ODESolver type " diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C index 59c551b6f8..7e8b7ed141 100644 --- a/src/OpenFOAM/db/IOstreams/token/token.C +++ b/src/OpenFOAM/db/IOstreams/token/token.C @@ -65,7 +65,7 @@ Foam::autoPtr Foam::token::compound::New IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(compoundType); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction(is) << "Unknown compound type " << compoundType << nl << nl diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C index 5837bd5773..f91ee70bf6 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C @@ -104,7 +104,7 @@ bool Foam::functionEntry::execute executedictionaryIstreamMemberFunctionTable::iterator mfIter = executedictionaryIstreamMemberFunctionTablePtr_->find(functionName); - if (mfIter == executedictionaryIstreamMemberFunctionTablePtr_->end()) + if (!mfIter.found()) { FatalErrorInFunction << "Unknown functionEntry '" << functionName @@ -147,7 +147,7 @@ bool Foam::functionEntry::execute executeprimitiveEntryIstreamMemberFunctionTable::iterator mfIter = executeprimitiveEntryIstreamMemberFunctionTablePtr_->find(functionName); - if (mfIter == executeprimitiveEntryIstreamMemberFunctionTablePtr_->end()) + if (!mfIter.found()) { FatalErrorInFunction << "Unknown functionEntry '" << functionName diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index 4ce4821b46..a7af08b8ef 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -95,7 +95,7 @@ Foam::autoPtr Foam::functionObject::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(functionType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown function type " diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C index 2d48607cce..47a8a8c3ce 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C @@ -94,7 +94,7 @@ Foam::pointPatchField::NewCalculatedType typename pointPatchConstructorTable::iterator patchTypeCstrIter = pointPatchConstructorTablePtr_->find(pf.patch().type()); - if (patchTypeCstrIter != pointPatchConstructorTablePtr_->end()) + if (patchTypeCstrIter.found()) { return autoPtr> ( diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C index 277f4c5407..79d90cf3a2 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C @@ -42,7 +42,7 @@ Foam::autoPtr> Foam::pointPatchField::New typename pointPatchConstructorTable::iterator cstrIter = pointPatchConstructorTablePtr_->find(patchFieldType); - if (cstrIter == pointPatchConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patchFieldType type " @@ -66,7 +66,7 @@ Foam::autoPtr> Foam::pointPatchField::New typename pointPatchConstructorTable::iterator patchTypeCstrIter = pointPatchConstructorTablePtr_->find(p.type()); - if (patchTypeCstrIter == pointPatchConstructorTablePtr_->end()) + if (!patchTypeCstrIter.found()) { FatalErrorInFunction << "inconsistent patch and patchField types for \n" @@ -120,14 +120,14 @@ Foam::autoPtr> Foam::pointPatchField::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(patchFieldType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { if (!disallowGenericPointPatchField) { cstrIter = dictionaryConstructorTablePtr_->find("generic"); } - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( @@ -160,7 +160,7 @@ Foam::autoPtr> Foam::pointPatchField::New typename dictionaryConstructorTable::iterator patchTypeCstrIter = dictionaryConstructorTablePtr_->find(p.type()); - if (patchTypeCstrIter == dictionaryConstructorTablePtr_->end()) + if (!patchTypeCstrIter.found()) { FatalIOErrorInFunction ( @@ -196,7 +196,7 @@ Foam::autoPtr> Foam::pointPatchField::New typename patchMapperConstructorTable::iterator cstrIter = patchMapperConstructorTablePtr_->find(ptf.type()); - if (cstrIter == patchMapperConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patchField type " diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C index 5eb1599d6e..e21540d185 100644 --- a/src/OpenFOAM/graph/graph.C +++ b/src/OpenFOAM/graph/graph.C @@ -215,7 +215,7 @@ Foam::autoPtr Foam::graph::writer::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(graphFormat); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown graph format " << graphFormat diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C index 3955291941..58060e89fe 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C @@ -43,7 +43,7 @@ Foam::autoPtr> Foam::tableReader::New dictionaryConstructorTablePtr_ ->find(readerType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown reader type " << readerType diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C index 39bfb0bcc3..59dd7cc0fd 100644 --- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C +++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C @@ -67,7 +67,7 @@ autoPtr interpolationWeights::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(type); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown interpolationWeights type " diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C index fd21dc3983..8e1aa10b79 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C @@ -42,7 +42,7 @@ Foam::LduMatrix::preconditioner::New typename symMatrixConstructorTable::iterator constructorIter = symMatrixConstructorTablePtr_->find(preconditionerName); - if (constructorIter == symMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( @@ -68,7 +68,7 @@ Foam::LduMatrix::preconditioner::New typename asymMatrixConstructorTable::iterator constructorIter = asymMatrixConstructorTablePtr_->find(preconditionerName); - if (constructorIter == asymMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C index d05203afc1..195871e41f 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C @@ -43,7 +43,7 @@ Foam::LduMatrix::smoother::New typename symMatrixConstructorTable::iterator constructorIter = symMatrixConstructorTablePtr_->find(smootherName); - if (constructorIter == symMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction(smootherDict) << "Unknown symmetric matrix smoother " << smootherName @@ -67,7 +67,7 @@ Foam::LduMatrix::smoother::New typename asymMatrixConstructorTable::iterator constructorIter = asymMatrixConstructorTablePtr_->find(smootherName); - if (constructorIter == asymMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction(smootherDict) << "Unknown asymmetric matrix smoother " << smootherName diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C index 651be6cee2..aebe9cb16f 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C @@ -56,7 +56,7 @@ Foam::LduMatrix::solver::New typename symMatrixConstructorTable::iterator constructorIter = symMatrixConstructorTablePtr_->find(solverName); - if (constructorIter == symMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction(solverDict) << "Unknown symmetric matrix solver " << solverName @@ -81,7 +81,7 @@ Foam::LduMatrix::solver::New typename asymMatrixConstructorTable::iterator constructorIter = asymMatrixConstructorTablePtr_->find(solverName); - if (constructorIter == asymMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction(solverDict) << "Unknown asymmetric matrix solver " << solverName diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C index 727f400a72..36d85e76e8 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C @@ -85,7 +85,7 @@ Foam::lduMatrix::preconditioner::New symMatrixConstructorTable::iterator constructorIter = symMatrixConstructorTablePtr_->find(name); - if (constructorIter == symMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( @@ -111,7 +111,7 @@ Foam::lduMatrix::preconditioner::New asymMatrixConstructorTable::iterator constructorIter = asymMatrixConstructorTablePtr_->find(name); - if (constructorIter == asymMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C index 3d3e3bbad0..4692df969b 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C @@ -89,7 +89,7 @@ Foam::autoPtr Foam::lduMatrix::smoother::New symMatrixConstructorTable::iterator constructorIter = symMatrixConstructorTablePtr_->find(name); - if (constructorIter == symMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction(solverControls) << "Unknown symmetric matrix smoother " @@ -116,7 +116,7 @@ Foam::autoPtr Foam::lduMatrix::smoother::New asymMatrixConstructorTable::iterator constructorIter = asymMatrixConstructorTablePtr_->find(name); - if (constructorIter == asymMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction(solverControls) << "Unknown asymmetric matrix smoother " diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C index a2ba3ea463..88c5733244 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C @@ -69,7 +69,7 @@ Foam::autoPtr Foam::lduMatrix::solver::New symMatrixConstructorTable::iterator constructorIter = symMatrixConstructorTablePtr_->find(name); - if (constructorIter == symMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction(solverControls) << "Unknown symmetric matrix solver " << name << nl << nl @@ -96,7 +96,7 @@ Foam::autoPtr Foam::lduMatrix::solver::New asymMatrixConstructorTable::iterator constructorIter = asymMatrixConstructorTablePtr_->find(name); - if (constructorIter == asymMatrixConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction(solverControls) << "Unknown asymmetric matrix solver " << name << nl << nl 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 21520669da..d0168688fa 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C @@ -307,7 +307,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New lduMeshConstructorTable::iterator cstrIter = lduMeshConstructorTablePtr_->find(agglomeratorType); - if (cstrIter == lduMeshConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown GAMGAgglomeration type " @@ -408,7 +408,7 @@ Foam::autoPtr Foam::GAMGAgglomeration::New geometryConstructorTable::iterator cstrIter = geometryConstructorTablePtr_->find(agglomeratorType); - if (cstrIter == geometryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown GAMGAgglomeration type " diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C index 926dd14724..0f8ababa3a 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C @@ -364,7 +364,7 @@ Foam::autoPtr Foam::GAMGProcAgglomeration::New GAMGAgglomerationConstructorTable::iterator cstrIter = GAMGAgglomerationConstructorTablePtr_->find(type); - if (cstrIter == GAMGAgglomerationConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown GAMGProcAgglomeration type " diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C index 2a69e4dd00..dda2e9024d 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/GAMGInterfaceFieldNew.C @@ -38,7 +38,7 @@ Foam::autoPtr Foam::GAMGInterfaceField::New lduInterfaceFieldConstructorTable::iterator cstrIter = lduInterfaceFieldConstructorTablePtr_->find(coupleType); - if (cstrIter == lduInterfaceFieldConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown GAMGInterfaceField type " @@ -64,7 +64,7 @@ Foam::autoPtr Foam::GAMGInterfaceField::New lduInterfaceConstructorTable::iterator cstrIter = lduInterfaceConstructorTablePtr_->find(coupleType); - if (cstrIter == lduInterfaceConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown GAMGInterfaceField type " diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C index 5130ad12f8..686fe2094e 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceNew.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::GAMGInterface::New lduInterfaceConstructorTable::iterator cstrIter = lduInterfaceConstructorTablePtr_->find(coupleType); - if (cstrIter == lduInterfaceConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown GAMGInterface type " << coupleType << ".\n" @@ -82,7 +82,7 @@ Foam::autoPtr Foam::GAMGInterface::New IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(coupleType); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown GAMGInterface type " << coupleType << ".\n" diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C index 8969bacec9..69e76fe3b6 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::facePointPatch::New polyPatchConstructorTable::iterator cstrIter = polyPatchConstructorTablePtr_->find(patch.type()); - if (cstrIter == polyPatchConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown facePointPatch type " diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C index e44810932d..97d8f602c0 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::polyPatch::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(patchType); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown polyPatch type " @@ -108,14 +108,14 @@ Foam::autoPtr Foam::polyPatch::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(patchType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { if (!disallowGenericPolyPatch) { cstrIter = dictionaryConstructorTablePtr_->find("genericPatch"); } - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C index fd6ed39cdd..2281285c07 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::cellZone::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(zoneType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C index 2b6954b340..b7d1e7a8d9 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::faceZone::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(zoneType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C index 3c5feac399..e17d645b4a 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::pointZone::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(zoneType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C index 81d4565401..5a965acbec 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C +++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C @@ -55,7 +55,7 @@ Foam::autoPtr> Foam::Function1::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(Function1Type); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown Function1 type " diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C index c5cc7ebdb7..6d449e0698 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C @@ -156,7 +156,7 @@ Foam::LESModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown LESModel type " diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C index b799237a36..0f0cafba0b 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C @@ -76,7 +76,7 @@ Foam::autoPtr Foam::LESdelta::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(deltaType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown LESdelta type " @@ -115,7 +115,7 @@ Foam::autoPtr Foam::LESdelta::New dictionaryConstructorTable::const_iterator cstrIter = dictionaryConstructorTablePtr_->find(deltaType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown LESdelta type " diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C index 6f614f0d91..dba84f07f8 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C @@ -49,7 +49,7 @@ Foam::autoPtr Foam::LESfilter::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(filterType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown LESfilter type " diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C index d95f2bffb3..1937ef097b 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C @@ -146,7 +146,7 @@ Foam::RASModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown RASModel type " diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C index 30d4d31921..8593c72df5 100644 --- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C +++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C @@ -108,7 +108,7 @@ Foam::TurbulenceModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown TurbulenceModel type " diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C index 0bd0bb49e3..82675e8bb4 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C @@ -117,7 +117,7 @@ Foam::laminarModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown laminarModel type " diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C index 8b5905ca4a..cefaf8a127 100644 --- a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C +++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C @@ -45,7 +45,7 @@ Foam::autoPtr Foam::reactionRateFlameArea::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(reactionRateFlameAreaType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C index 6c06cf881d..76c2fb76ae 100644 --- a/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C +++ b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C @@ -56,7 +56,7 @@ Foam::combustionModels::psiCombustionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(combModelName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown psiCombustionModel type " diff --git a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C index e179f04141..6060d2acc5 100644 --- a/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C +++ b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C @@ -56,7 +56,7 @@ Foam::combustionModels::rhoCombustionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(combTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown rhoCombustionModel type " diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C index fa05cc2a59..d9edadcc3f 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C @@ -71,7 +71,7 @@ Foam::autoPtr Foam::dynamicFvMesh::New(const IOobject& io) IOobjectConstructorTable::iterator cstrIter = IOobjectConstructorTablePtr_->find(dynamicFvMeshTypeName); - if (cstrIter == IOobjectConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown dynamicFvMesh type " diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C index cf34d6eb70..629d16a478 100644 --- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C +++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C @@ -48,7 +48,7 @@ Foam::autoPtr Foam::cellLooper::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(type); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown set type " diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C index a8797b3cd9..6a8dbe3640 100644 --- a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C +++ b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C @@ -110,7 +110,7 @@ Foam::displacementMotionSolver::New displacementConstructorTable::iterator cstrIter = displacementConstructorTablePtr_->find(solverTypeName); - if (cstrIter == displacementConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown solver type " diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C index dfb9d5e1f3..911c888101 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C @@ -40,7 +40,7 @@ Foam::autoPtr Foam::solidBodyMotionFunction::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(motionType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown solidBodyMotionFunction type " diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C index a637338472..943c227b87 100644 --- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C +++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C @@ -125,7 +125,7 @@ Foam::autoPtr Foam::motionSolver::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(solverTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown solver type " diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C index e85f4d5959..f445f1a348 100644 --- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C +++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::polyMeshModifier::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modifierType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/edgeMesh/edgeMeshIO.C b/src/edgeMesh/edgeMeshIO.C index 6b4dd6f382..64f918b193 100644 --- a/src/edgeMesh/edgeMeshIO.C +++ b/src/edgeMesh/edgeMeshIO.C @@ -99,7 +99,7 @@ void Foam::edgeMesh::write writefileExtensionMemberFunctionTable::iterator mfIter = writefileExtensionMemberFunctionTablePtr_->find(ext); - if (mfIter == writefileExtensionMemberFunctionTablePtr_->end()) + if (!mfIter.found()) { FatalErrorInFunction << "Unknown file extension " << ext << nl << nl diff --git a/src/edgeMesh/edgeMeshNew.C b/src/edgeMesh/edgeMeshNew.C index 8258da4b57..608c5033df 100644 --- a/src/edgeMesh/edgeMeshNew.C +++ b/src/edgeMesh/edgeMeshNew.C @@ -36,7 +36,7 @@ Foam::autoPtr Foam::edgeMesh::New fileExtensionConstructorTable::iterator cstrIter = fileExtensionConstructorTablePtr_->find(ext); - if (cstrIter == fileExtensionConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown file extension " << ext diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C index ad0c52966e..96ca550f8b 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C +++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C @@ -45,7 +45,7 @@ Foam::autoPtr Foam::extendedEdgeMesh::New fileExtensionConstructorTable::iterator cstrIter = fileExtensionConstructorTablePtr_->find(ext); - if (cstrIter == fileExtensionConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown file extension " << ext diff --git a/src/engine/engineMesh/engineMesh/engineMeshNew.C b/src/engine/engineMesh/engineMesh/engineMeshNew.C index afbd421829..8d074d8e9c 100644 --- a/src/engine/engineMesh/engineMesh/engineMeshNew.C +++ b/src/engine/engineMesh/engineMesh/engineMeshNew.C @@ -56,7 +56,7 @@ Foam::autoPtr Foam::engineMesh::New IOobjectConstructorTable::iterator cstrIter = IOobjectConstructorTablePtr_->find(modelType); - if (cstrIter == IOobjectConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown engineMesh type " diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/fileFormats/sampledSetWriters/writer.C index afc3603dab..64b9743203 100644 --- a/src/fileFormats/sampledSetWriters/writer.C +++ b/src/fileFormats/sampledSetWriters/writer.C @@ -39,7 +39,7 @@ Foam::autoPtr> Foam::writer::New typename wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(writeType); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown write type " diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C index afcf8cef51..ce5a5d148b 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C @@ -55,7 +55,7 @@ Foam::autoPtr Foam::SRF::SRFModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown SRFModel type " diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C index d6ccd5c66b..1f51c3d00a 100644 --- a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C +++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C @@ -78,7 +78,7 @@ Foam::autoPtr Foam::fv::option::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown Model type " << modelType << nl << nl diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C index 592ff1f961..e45f4a2964 100644 --- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C +++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C @@ -43,7 +43,7 @@ Foam::autoPtr Foam::porosityModel::New meshConstructorTable::iterator cstrIter = meshConstructorTablePtr_->find(modelType); - if (cstrIter == meshConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown " << typeName << " type " << modelType << nl << nl diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C index c3677cc0d0..0f205cd057 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C @@ -105,7 +105,7 @@ Foam::fvPatchField::NewCalculatedType typename patchConstructorTable::iterator patchTypeCstrIter = patchConstructorTablePtr_->find(p.type()); - if (patchTypeCstrIter != patchConstructorTablePtr_->end()) + if (patchTypeCstrIter.found()) { return patchTypeCstrIter() ( diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C index 537881840b..664f3ca2f2 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C @@ -45,7 +45,7 @@ Foam::tmp> Foam::fvPatchField::New typename patchConstructorTable::iterator cstrIter = patchConstructorTablePtr_->find(patchFieldType); - if (cstrIter == patchConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patchField type " @@ -64,7 +64,7 @@ Foam::tmp> Foam::fvPatchField::New || actualPatchType != p.type() ) { - if (patchTypeCstrIter != patchConstructorTablePtr_->end()) + if (patchTypeCstrIter.found()) { return patchTypeCstrIter()(p, iF); } @@ -78,7 +78,7 @@ Foam::tmp> Foam::fvPatchField::New tmp> tfvp = cstrIter()(p, iF); // Check if constraint type override and store patchType if so - if ((patchTypeCstrIter != patchConstructorTablePtr_->end())) + if (patchTypeCstrIter.found()) { tfvp.ref().patchType() = actualPatchType; } @@ -119,14 +119,14 @@ Foam::tmp> Foam::fvPatchField::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(patchFieldType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { if (!disallowGenericFvPatchField) { cstrIter = dictionaryConstructorTablePtr_->find("generic"); } - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( @@ -185,7 +185,7 @@ Foam::tmp> Foam::fvPatchField::New typename patchMapperConstructorTable::iterator cstrIter = patchMapperConstructorTablePtr_->find(ptf.type()); - if (cstrIter == patchMapperConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patchField type " << ptf.type() << nl << nl diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C index 5202908f98..fcfbb1dae1 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C @@ -103,7 +103,7 @@ Foam::fvsPatchField::NewCalculatedType typename patchConstructorTable::iterator patchTypeCstrIter = patchConstructorTablePtr_->find(p.type()); - if (patchTypeCstrIter != patchConstructorTablePtr_->end()) + if (patchTypeCstrIter.found()) { return patchTypeCstrIter() ( diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C index 9becf00ccf..32c567f95d 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C @@ -42,7 +42,7 @@ Foam::tmp> Foam::fvsPatchField::New typename patchConstructorTable::iterator cstrIter = patchConstructorTablePtr_->find(patchFieldType); - if (cstrIter == patchConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patchField type " @@ -61,7 +61,7 @@ Foam::tmp> Foam::fvsPatchField::New typename patchConstructorTable::iterator patchTypeCstrIter = patchConstructorTablePtr_->find(p.type()); - if (patchTypeCstrIter != patchConstructorTablePtr_->end()) + if (patchTypeCstrIter.found()) { return patchTypeCstrIter()(p, iF); } @@ -107,14 +107,14 @@ Foam::tmp> Foam::fvsPatchField::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(patchFieldType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { if (!disallowGenericFvsPatchField) { cstrIter = dictionaryConstructorTablePtr_->find("generic"); } - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( @@ -173,7 +173,7 @@ Foam::tmp> Foam::fvsPatchField::New typename patchMapperConstructorTable::iterator cstrIter = patchMapperConstructorTablePtr_->find(ptf.type()); - if (cstrIter == patchMapperConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patchField type " << ptf.type() << nl << nl @@ -185,7 +185,7 @@ Foam::tmp> Foam::fvsPatchField::New typename patchMapperConstructorTable::iterator patchTypeCstrIter = patchMapperConstructorTablePtr_->find(p.type()); - if (patchTypeCstrIter != patchMapperConstructorTablePtr_->end()) + if (patchTypeCstrIter.found()) { return patchTypeCstrIter()(ptf, p, iF, pfMapper); } diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C index a3ba465414..a8539a5c48 100644 --- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C +++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C @@ -82,7 +82,7 @@ tmp> convectionScheme::New typename IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(schemeName); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( @@ -128,7 +128,7 @@ tmp> convectionScheme::New typename MultivariateConstructorTable::iterator cstrIter = MultivariateConstructorTablePtr_->find(schemeName); - if (cstrIter == MultivariateConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C index 8113fed871..d9c7091e6b 100644 --- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C +++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C @@ -69,7 +69,7 @@ tmp> d2dt2Scheme::New typename IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(schemeName); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C index 98d0ec1057..03c2055673 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C @@ -69,7 +69,7 @@ tmp> ddtScheme::New typename IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(schemeName); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C index 17c042539a..af586b63a5 100644 --- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C +++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C @@ -70,7 +70,7 @@ tmp> divScheme::New typename IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(schemeName); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C index 2c045538e2..4358fab029 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C @@ -57,7 +57,7 @@ Foam::tmp> Foam::fv::gradScheme::New typename IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(schemeName); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C index fc24a6221e..f783228754 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C @@ -68,7 +68,7 @@ tmp> laplacianScheme::New typename IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(schemeName); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C index 2ad75944f4..ae7d0de458 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C @@ -70,7 +70,7 @@ tmp> snGradScheme::New typename MeshConstructorTable::iterator constructorIter = MeshConstructorTablePtr_->find(schemeName); - if (constructorIter == MeshConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C index ad52725ee9..468b9b88f6 100644 --- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C +++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C @@ -43,7 +43,7 @@ Foam::autoPtr Foam::fvPatch::New polyPatchConstructorTable::iterator cstrIter = polyPatchConstructorTablePtr_->find(patch.type()); - if (cstrIter == polyPatchConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown fvPatch type " << patch.type() << nl diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C index c4c6432e11..349d356497 100644 --- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C +++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C @@ -63,7 +63,7 @@ Foam::autoPtr Foam::patchDistMethod::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(patchDistMethodType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patchDistMethodType type " @@ -93,7 +93,7 @@ Foam::autoPtr Foam::patchDistMethod::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(patchDistMethodType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patchDistMethodType type " diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C index 99544f2e6a..decc033fe5 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C +++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C @@ -38,7 +38,7 @@ Foam::autoPtr> Foam::interpolation::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(interpolationType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown interpolation type " << interpolationType diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C index 62d3b3903e..fae9dddca3 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C @@ -61,7 +61,7 @@ Foam::limitedSurfaceInterpolationScheme::New typename MeshConstructorTable::iterator constructorIter = MeshConstructorTablePtr_->find(schemeName); - if (constructorIter == MeshConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( @@ -110,7 +110,7 @@ Foam::limitedSurfaceInterpolationScheme::New typename MeshFluxConstructorTable::iterator constructorIter = MeshFluxConstructorTablePtr_->find(schemeName); - if (constructorIter == MeshFluxConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C index 62288018b0..ea3017016b 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C @@ -71,7 +71,7 @@ Foam::multivariateSurfaceInterpolationScheme::New typename IstreamConstructorTable::iterator constructorIter = IstreamConstructorTablePtr_->find(schemeName); - if (constructorIter == IstreamConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C index 8d7074174f..089d21bee2 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C @@ -61,7 +61,7 @@ Foam::surfaceInterpolationScheme::New typename MeshConstructorTable::iterator constructorIter = MeshConstructorTablePtr_->find(schemeName); - if (constructorIter == MeshConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( @@ -109,7 +109,7 @@ Foam::surfaceInterpolationScheme::New typename MeshFluxConstructorTable::iterator constructorIter = MeshFluxConstructorTablePtr_->find(schemeName); - if (constructorIter == MeshFluxConstructorTablePtr_->end()) + if (!constructorIter.found()) { FatalIOErrorInFunction ( diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C b/src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C index 07d96c8ba3..270859347e 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C @@ -46,7 +46,7 @@ Foam::functionObjects::fieldValue::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown " << typeName << " type " diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.C b/src/functionObjects/graphics/runTimePostProcessing/pathline.C index aba780e5ed..aedd860827 100644 --- a/src/functionObjects/graphics/runTimePostProcessing/pathline.C +++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.C @@ -195,7 +195,7 @@ Foam::functionObjects::runTimePostPro::pathline::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(pathlineType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown pathline type " diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.C b/src/functionObjects/graphics/runTimePostProcessing/pointData.C index c5581a6001..94c289d1f7 100644 --- a/src/functionObjects/graphics/runTimePostProcessing/pointData.C +++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.C @@ -153,7 +153,7 @@ Foam::autoPtr Foam::functionOb dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(pointDataType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown pointData type " diff --git a/src/functionObjects/graphics/runTimePostProcessing/surface.C b/src/functionObjects/graphics/runTimePostProcessing/surface.C index 903f0c24b6..5c0383c4ab 100644 --- a/src/functionObjects/graphics/runTimePostProcessing/surface.C +++ b/src/functionObjects/graphics/runTimePostProcessing/surface.C @@ -220,7 +220,7 @@ Foam::functionObjects::runTimePostPro::surface::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(surfaceType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown surface type " diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C index e97e428ad6..85192b98ec 100644 --- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C +++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C @@ -43,7 +43,7 @@ Foam::functionObjects::runTimeControls::runTimeCondition::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(conditionType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown runTimeCondition type " diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C index 4c01a9ebf7..161c424b26 100644 --- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C +++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C @@ -57,7 +57,7 @@ Foam::autoPtr Foam::motionDiffusivity::New IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(motionType); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown diffusion type " diff --git a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C index 4e73a2cd4b..c59808a21b 100644 --- a/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C +++ b/src/fvMotionSolver/motionInterpolation/motionInterpolation/motionInterpolation.C @@ -77,7 +77,7 @@ Foam::motionInterpolation::New(const fvMesh& mesh, Istream& entry) IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(type); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown interpolation type " diff --git a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C index 8934fa53ad..c4f4b1a1ce 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C +++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C @@ -82,7 +82,7 @@ Foam::autoPtr Foam::profileModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown profile model type " << modelType diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C index e8c01c639b..92b0b09f5c 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C +++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C @@ -40,7 +40,7 @@ Foam::autoPtr Foam::trimModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown " << typeName << " type " diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C index d01df91c78..43488462bd 100644 --- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C +++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C @@ -42,7 +42,7 @@ Foam::BinaryCollisionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown BinaryCollisionModel type " diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C index 4527542382..fb67a50e0a 100644 --- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C +++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C @@ -42,7 +42,7 @@ Foam::InflowBoundaryModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown InflowBoundaryModel type " diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C index 1652caac6c..55a134367e 100644 --- a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C +++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C @@ -42,7 +42,7 @@ Foam::WallInteractionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown WallInteractionModel type " diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C index e458085a43..d5d3132187 100644 --- a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C +++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C @@ -41,7 +41,7 @@ Foam::distributionModels::distributionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown distribution model type " << modelType << nl << nl diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C index b85a24c61b..1c84dc5ae9 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C +++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C @@ -44,7 +44,7 @@ Foam::IntegrationScheme::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(schemeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown integration scheme type " diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C index 1a5998b391..1b115c6c26 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C @@ -43,7 +43,7 @@ Foam::CloudFunctionObject::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(objectType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown cloud function type " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C index 3237690f6f..8548abfc76 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C @@ -42,7 +42,7 @@ Foam::CollisionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown collision model type " << modelType diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C index a9f5b47f5c..f98062e8e1 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C @@ -42,7 +42,7 @@ Foam::PairModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(PairModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown pair model type " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C index ec49454ff1..21b9f57318 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C @@ -42,7 +42,7 @@ Foam::WallModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(WallModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown wall model type type " << WallModelType diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C index 70422ee16b..f8c1f4f538 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C @@ -42,7 +42,7 @@ Foam::DispersionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown dispersion model type " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C index 934b86f17f..b60c2e0031 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C @@ -42,7 +42,7 @@ Foam::InjectionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown injection model type " @@ -70,7 +70,7 @@ Foam::InjectionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown injection model type " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C index d30f34bb99..a4f1db04b5 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForceNew.C @@ -42,7 +42,7 @@ Foam::ParticleForce::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(forceType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown particle force type " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C index 1c711dba11..19611a30b8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C @@ -42,7 +42,7 @@ Foam::PatchInteractionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown patch interaction model type " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C index 9faff867b5..3364416bbb 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C @@ -42,7 +42,7 @@ Foam::StochasticCollisionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown model type type " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C index 516641d066..7344b41f77 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C @@ -42,7 +42,7 @@ Foam::SurfaceFilmModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown surface film model type " diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C index f683306585..c64b12115a 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C @@ -92,7 +92,7 @@ Foam::AveragingMethod::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(averageType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown averaging method " << averageType diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C index a7ac4c3638..d958d1a146 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C @@ -63,7 +63,7 @@ Foam::CorrectionLimitingMethod::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown correction limiter type " << modelType diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C index 3c33ee1084..8d7836cb2b 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C @@ -87,7 +87,7 @@ Foam::DampingModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown damping model type " << modelType diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C index d11cfb7a13..c8b02261b8 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C @@ -91,7 +91,7 @@ Foam::IsotropyModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown isotropy model type " << modelType diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C index 38187b8e3a..136c13eff4 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C @@ -89,7 +89,7 @@ Foam::PackingModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown packing model type " << modelType diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C index 7f9509e898..29e95f3095 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C @@ -70,7 +70,7 @@ Foam::autoPtr Foam::ParticleStressModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown particle stress model type " << modelType diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C index c700a01efc..6502846403 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C @@ -72,7 +72,7 @@ Foam::autoPtr Foam::TimeScaleModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown time scale model type " << modelType diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C index 0323115fd7..3ed57d2d48 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C @@ -42,7 +42,7 @@ Foam::CompositionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown composition model type " diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C index bf8ff340bc..8f85b5298e 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C @@ -42,7 +42,7 @@ Foam::PhaseChangeModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown phase change model type " diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C index 4388b04986..195a955fbf 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C @@ -42,7 +42,7 @@ Foam::DevolatilisationModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown devolatilisation model type " diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C index 4fd894b93c..f57f768e95 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C @@ -42,7 +42,7 @@ Foam::SurfaceReactionModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown surface reaction model type " diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C index 6fae8667d2..6396e4c698 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C @@ -42,7 +42,7 @@ Foam::HeatTransferModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown heat transfer model type " diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C index 0ea36b20e0..fdc1b1bfd8 100644 --- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C +++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::energyScalingFunction::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(scalingType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown energyScalingFunction type " diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C index ff3f925682..a6ed6c1e2c 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C @@ -43,7 +43,7 @@ Foam::autoPtr Foam::pairPotential::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(potentialType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown pairPotential type " diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C index 58da03728d..55d1f6864a 100644 --- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C +++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::tetherPotential::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(potentialType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown tetherPotential type " diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C index 475f66f088..5562895841 100644 --- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C +++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C @@ -42,7 +42,7 @@ Foam::AtomizationModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(AtomizationModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown AtomizationModelType type " diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C index 649b465b29..25a1e75d69 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C +++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C @@ -42,7 +42,7 @@ Foam::BreakupModel::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(BreakupModelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown BreakupModelType type " diff --git a/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C b/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C index 12f63a3057..fd53017394 100644 --- a/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C +++ b/src/mesh/blockMesh/blockEdges/blockEdge/blockEdge.C @@ -90,7 +90,7 @@ Foam::autoPtr Foam::blockEdge::New IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(edgeType); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown blockEdge type " diff --git a/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C b/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C index 7f777b8a80..cec92a091a 100644 --- a/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C +++ b/src/mesh/blockMesh/blockFaces/blockFace/blockFace.C @@ -87,7 +87,7 @@ Foam::autoPtr Foam::blockFace::New IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(faceType); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown blockFace type " diff --git a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C index fba46625b1..3593a69ec8 100644 --- a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C +++ b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C @@ -81,7 +81,7 @@ Foam::autoPtr Foam::blockVertex::New IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(faceType); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown blockVertex type " diff --git a/src/mesh/blockMesh/blocks/block/block.C b/src/mesh/blockMesh/blocks/block/block.C index 5d75aa5574..96e8c5d4c1 100644 --- a/src/mesh/blockMesh/blocks/block/block.C +++ b/src/mesh/blockMesh/blocks/block/block.C @@ -81,7 +81,7 @@ Foam::autoPtr Foam::block::New IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(blockOrCellShapeType); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { is.putBack(blockOrCellShapeType); return autoPtr(new block(dict, index, points, edges, faces, is)); diff --git a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C index 010ddc4de4..570a4518d3 100644 --- a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C +++ b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C @@ -39,7 +39,7 @@ Foam::autoPtr Foam::extrudeModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown extrudeModel type " diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C index b5100a4e8a..5b945d5164 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C @@ -144,7 +144,7 @@ Foam::externalDisplacementMeshMover::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(type); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown externalDisplacementMeshMover type " diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C index a16a91fa6b..c43a03c950 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C @@ -47,7 +47,7 @@ Foam::AMIMethod::New typename componentsConstructorTable::iterator cstrIter = componentsConstructorTablePtr_->find(methodName); - if (cstrIter == componentsConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown AMIMethod type " diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C index 59f3e520cb..34b169cf0e 100644 --- a/src/meshTools/coordinateSystems/coordinateSystemNew.C +++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C @@ -40,7 +40,7 @@ Foam::autoPtr Foam::coordinateSystem::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(coordType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/meshTools/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurface/searchableSurface.C index 0f5fe77dec..ac9b9daab0 100644 --- a/src/meshTools/searchableSurface/searchableSurface.C +++ b/src/meshTools/searchableSurface/searchableSurface.C @@ -46,7 +46,7 @@ Foam::autoPtr Foam::searchableSurface::New dictConstructorTable::iterator cstrIter = dictConstructorTablePtr_->find(searchableSurfaceType); - if (cstrIter == dictConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown searchableSurface type " << searchableSurfaceType diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C index 216c417c64..b20ddfbd49 100644 --- a/src/meshTools/sets/topoSetSource/topoSetSource.C +++ b/src/meshTools/sets/topoSetSource/topoSetSource.C @@ -80,7 +80,7 @@ Foam::autoPtr Foam::topoSetSource::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(topoSetSourceType); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown topoSetSource type " << topoSetSourceType @@ -104,7 +104,7 @@ Foam::autoPtr Foam::topoSetSource::New istreamConstructorTable::iterator cstrIter = istreamConstructorTablePtr_->find(topoSetSourceType); - if (cstrIter == istreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown topoSetSource type " << topoSetSourceType diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C index cc65eb8097..ca2e6d7bbc 100644 --- a/src/meshTools/sets/topoSets/topoSet.C +++ b/src/meshTools/sets/topoSets/topoSet.C @@ -54,7 +54,7 @@ Foam::autoPtr Foam::topoSet::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(setType); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown set type " << setType @@ -80,7 +80,7 @@ Foam::autoPtr Foam::topoSet::New sizeConstructorTable::iterator cstrIter = sizeConstructorTablePtr_->find(setType); - if (cstrIter == sizeConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown set type " << setType @@ -106,7 +106,7 @@ Foam::autoPtr Foam::topoSet::New setConstructorTable::iterator cstrIter = setConstructorTablePtr_->find(setType); - if (cstrIter == setConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown set type " << setType diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C index 1a4e31de0b..3f6e7f6002 100644 --- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C +++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C @@ -60,7 +60,7 @@ Foam::decompositionConstraint::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction(dict) << "Unknown decompositionConstraint type " diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C index 6430ff9b41..984851df71 100644 --- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C +++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C @@ -187,7 +187,7 @@ Foam::autoPtr Foam::decompositionMethod::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(methodType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown decompositionMethod " diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C index 3f5fa4f25f..72f06f7649 100644 --- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C +++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C @@ -36,7 +36,7 @@ Foam::autoPtr Foam::noiseModel::New(const dictionary& dict) dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown noiseModel type " diff --git a/src/randomProcesses/windowModels/windowModel/windowModelNew.C b/src/randomProcesses/windowModels/windowModel/windowModelNew.C index 68aed5d766..d4dd15b07e 100644 --- a/src/randomProcesses/windowModels/windowModel/windowModelNew.C +++ b/src/randomProcesses/windowModels/windowModel/windowModelNew.C @@ -40,7 +40,7 @@ Foam::autoPtr Foam::windowModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorIn ( diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C index ea38a60f47..85db5ce6c8 100644 --- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C +++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C @@ -66,7 +66,7 @@ autoPtr pyrolysisModel::New meshConstructorTable::iterator cstrIter = meshConstructorTablePtr_->find(modelType); - if (cstrIter == meshConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown pyrolysisModel type " << modelType @@ -94,7 +94,7 @@ autoPtr pyrolysisModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown pyrolysisModel type " << modelType diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C index 3b41bc8d3b..8c4b1bce34 100644 --- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C +++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C @@ -42,7 +42,7 @@ Foam::regionModels::regionModelFunctionObject::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown region model function type " diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C index f177c506ac..67baf4f6c1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C @@ -49,7 +49,7 @@ autoPtr filmThermoModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown filmThermoModel type " << modelType << nl << nl diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C index 4485b6c87b..a138fa6a68 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C @@ -49,7 +49,7 @@ autoPtr filmTurbulenceModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown filmTurbulenceModel type " << modelType diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C index c8c71f5888..4ce1b6608d 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C @@ -48,7 +48,7 @@ autoPtr force::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown force type " << modelType diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C index dcb17eec8d..b06590a55c 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C @@ -48,7 +48,7 @@ autoPtr injectionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown injectionModel type " << modelType diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C index 7167b32e49..781f1778ef 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C @@ -49,7 +49,7 @@ autoPtr filmRadiationModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown radiationModel type " << modelType << nl << nl diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C index daba92d47c..25be0a0c28 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C @@ -50,7 +50,7 @@ autoPtr filmViscosityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown filmViscosityModel type " << modelType diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C index 41df73789c..52b1870390 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C @@ -49,7 +49,7 @@ autoPtr heatTransferModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown heatTransferModel type " << modelType << nl << nl diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C index e673ca36b2..add63599f3 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C @@ -49,7 +49,7 @@ autoPtr phaseChangeModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown phaseChangeModel type " << modelType diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C index cfd451d459..91b7639d9c 100644 --- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C +++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C @@ -69,7 +69,7 @@ autoPtr surfaceFilmModel::New meshConstructorTable::iterator cstrIter = meshConstructorTablePtr_->find(modelType); - if (cstrIter == meshConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown surfaceFilmModel type " << modelType diff --git a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C index 30703d258f..6a9f88a1f0 100644 --- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C +++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C @@ -64,7 +64,7 @@ autoPtr thermalBaffleModel::New(const fvMesh& mesh) meshConstructorTable::iterator cstrIter = meshConstructorTablePtr_->find(modelType); - if (cstrIter == meshConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction @@ -91,7 +91,7 @@ autoPtr thermalBaffleModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction diff --git a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C index ab9980287a..8c91320221 100644 --- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C +++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C @@ -51,7 +51,7 @@ Foam::autoPtr Foam::renumberMethod::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(methodType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown renumberMethod " diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C index ef744a5a0a..20ba5e1423 100644 --- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C +++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C @@ -79,7 +79,7 @@ Foam::autoPtr Foam::RBD::rigidBody::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(bodyType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown rigidBody type " diff --git a/src/rigidBodyDynamics/joints/joint/joint.C b/src/rigidBodyDynamics/joints/joint/joint.C index f13ee347ea..f5a89e9b72 100644 --- a/src/rigidBodyDynamics/joints/joint/joint.C +++ b/src/rigidBodyDynamics/joints/joint/joint.C @@ -56,7 +56,7 @@ Foam::autoPtr Foam::RBD::joint::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(bodyType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown joint type " diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C index ee8e0f2f1c..ba95967324 100644 --- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C +++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C @@ -40,7 +40,7 @@ Foam::RBD::restraint::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(restraintType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown restraint type " diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C index 8db7777f77..0a24730e7e 100644 --- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C +++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C @@ -40,7 +40,7 @@ Foam::autoPtr Foam::RBD::rigidBodySolver::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(rigidBodySolverType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown rigidBodySolverType type " diff --git a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C index 5eaf5e3d3b..c315dfc76b 100644 --- a/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C +++ b/src/sampling/meshToMesh/calcMethod/meshToMeshMethod/meshToMeshMethodNew.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::meshToMeshMethod::New componentsConstructorTable::iterator cstrIter = componentsConstructorTablePtr_->find(methodName); - if (cstrIter == componentsConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown meshToMesh type " diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C index f583aaea86..cab0f3eb13 100644 --- a/src/sampling/sampledSet/sampledSet/sampledSet.C +++ b/src/sampling/sampledSet/sampledSet/sampledSet.C @@ -451,7 +451,7 @@ Foam::autoPtr Foam::sampledSet::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(sampleType); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown sample type " diff --git a/src/sampling/sampledSurface/readers/surfaceReaderNew.C b/src/sampling/sampledSurface/readers/surfaceReaderNew.C index 415179e273..9a360611f3 100644 --- a/src/sampling/sampledSurface/readers/surfaceReaderNew.C +++ b/src/sampling/sampledSurface/readers/surfaceReaderNew.C @@ -36,7 +36,7 @@ Foam::autoPtr Foam::surfaceReader::New fileNameConstructorTable::iterator cstrIter = fileNameConstructorTablePtr_->find(readerType); - if (cstrIter == fileNameConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown reader type \"" << readerType << "\"\n\n" diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C index ddaea516a0..0901dc4c94 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C @@ -64,7 +64,7 @@ Foam::autoPtr Foam::sampledSurface::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(sampleType); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown sample type " diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C index bba94f1e57..355f6431bf 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.C +++ b/src/sampling/sampledSurface/writers/surfaceWriter.C @@ -57,7 +57,7 @@ Foam::surfaceWriter::New(const word& writeType) wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(writeType); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { if (MeshedSurfaceProxy::canWriteType(writeType)) { @@ -66,7 +66,7 @@ Foam::surfaceWriter::New(const word& writeType) return autoPtr(new proxySurfaceWriter(writeType)); } - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown write type \"" << writeType << "\"\n\n" @@ -89,7 +89,7 @@ Foam::surfaceWriter::New(const word& writeType, const dictionary& optDict) wordDictConstructorTable::iterator cstrIter = wordDictConstructorTablePtr_->find(writeType); - if (cstrIter == wordDictConstructorTablePtr_->end()) + if (!cstrIter.found()) { // revert to versions without options return Foam::surfaceWriter::New(writeType); diff --git a/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C b/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C index a26a3e1623..dffee65df2 100644 --- a/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C +++ b/src/sampling/surfMeshSampler/surfMeshSampler/surfMeshSampler.C @@ -81,7 +81,7 @@ Foam::surfMeshSampler::New wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(sampleType); - if (cstrIter == wordConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown sample type " diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C index 9173e2fb81..6200cdcc67 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C @@ -43,7 +43,7 @@ Foam::sixDoFRigidBodyMotionConstraint::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(constraintType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown sixDoFRigidBodyMotionConstraint type " diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C index 3398826611..864e8eee8c 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C @@ -42,7 +42,7 @@ Foam::sixDoFRigidBodyMotionRestraint::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(restraintType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown sixDoFRigidBodyMotionRestraint type " diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C index d9d92826c7..44e4f0b58e 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C +++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C @@ -40,7 +40,7 @@ Foam::autoPtr Foam::sixDoFSolver::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(sixDoFSolverType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown sixDoFSolverType type " diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C index c37b8ec033..3ba0e8e5c1 100644 --- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C +++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModelNew.C @@ -45,7 +45,7 @@ Foam::barotropicCompressibilityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown barotropicCompressibilityModel type " diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C index 37c7044ecd..bdc0a3e2a7 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C @@ -78,7 +78,7 @@ Foam::chemistryReductionMethod::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(chemistryReductionMethodTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown chemistryReductionMethodType type " diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C index 269613d1d0..a7f9268d3e 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C @@ -78,7 +78,7 @@ Foam::chemistryTabulationMethod::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(chemistryTabulationMethodName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown chemistryTabulationMethodType type " diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C index a92ced331e..b0e72f1c5e 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C @@ -126,7 +126,7 @@ Foam::autoPtr Foam::basicChemistryModel::New typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter = ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName); - if (cstrIter == ChemistryModel::fvMeshConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown " << ChemistryModel::typeName << " type " << nl @@ -182,7 +182,7 @@ Foam::autoPtr Foam::basicChemistryModel::New typename ChemistryModel::fvMeshConstructorTable::iterator cstrIter = ChemistryModel::fvMeshConstructorTablePtr_->find(chemistryTypeName); - if (cstrIter == ChemistryModel::fvMeshConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown " << ChemistryModel::typeName << " type " diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C index 5b31f20d10..74c87d4dd5 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C +++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C @@ -53,7 +53,7 @@ Foam::autoPtr Foam::laminarFlameSpeed::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(corrType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C index 57f6e78955..b7190cff51 100644 --- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C +++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C @@ -133,7 +133,7 @@ Foam::autoPtr Foam::liquidProperties::New(Istream& is) ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(liquidPropertiesType); - if (cstrIter == ConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown liquidProperties type " @@ -181,7 +181,7 @@ Foam::autoPtr Foam::liquidProperties::New ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(liquidPropertiesTypeName); - if (cstrIter == ConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown liquidProperties type " @@ -198,7 +198,7 @@ Foam::autoPtr Foam::liquidProperties::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(liquidPropertiesTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown liquidProperties type " diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C index e9c34b5726..259c6c01da 100644 --- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C +++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C @@ -43,7 +43,7 @@ Foam::autoPtr Foam::solidProperties::New(Istream& is) ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(solidType); - if (cstrIter == ConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown solidProperties type " << solidType << nl << nl @@ -89,7 +89,7 @@ Foam::autoPtr Foam::solidProperties::New ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(solidType); - if (cstrIter == ConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown solidProperties type " << solidType << nl << nl diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C index 9e371d2489..9b730c2228 100644 --- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C +++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C @@ -60,7 +60,7 @@ Foam::radiation::radiationModel::New TConstructorTable::iterator cstrIter = TConstructorTablePtr_->find(modelType); - if (cstrIter == TConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown radiationModel type " @@ -88,7 +88,7 @@ Foam::radiation::radiationModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown radiationModel type " diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C index c509e25d9e..0705302b45 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C @@ -42,7 +42,7 @@ Foam::radiation::absorptionEmissionModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown absorptionEmissionModel type " diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C index 9f6951323c..ab825045bc 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::radiation::scatterModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown scatterModel type " diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C index c7807b4241..1871870591 100644 --- a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C @@ -47,7 +47,7 @@ Foam::radiation::sootModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown sootModel type " diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C index 897895d7f3..07298ef596 100644 --- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C @@ -42,7 +42,7 @@ transmissivityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown transmissivityModel type " diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C index 22c5f63f0b..c0d9e3f7af 100644 --- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C +++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C @@ -47,7 +47,7 @@ Foam::chemistryReader::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(chemistryReaderTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown chemistryReader type " diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C index 12a5d39fa3..5ac8e03ef3 100644 --- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C +++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C @@ -119,7 +119,7 @@ New fvMeshConstructorTable::iterator cstrIter = fvMeshConstructorTablePtr_->find(chemistryTypeName); - if (cstrIter == fvMeshConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown " << typeName << " type " << nl diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index 8dff4ef938..6df600099f 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -379,7 +379,7 @@ Foam::Reaction::New typename IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(reactionTypeName); - if (cstrIter == IstreamConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction ( @@ -412,7 +412,7 @@ Foam::Reaction::New typename dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(reactionTypeName); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown reaction type " diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C index 23377cd692..df4dcff09e 100644 --- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C +++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::viscosityModel::New dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); - if (cstrIter == dictionaryConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalErrorInFunction << "Unknown viscosityModel type " diff --git a/src/waveModels/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C index 60446418e5..b47ea48217 100644 --- a/src/waveModels/waveModel/waveModelNew.C +++ b/src/waveModels/waveModel/waveModelNew.C @@ -65,7 +65,7 @@ Foam::autoPtr Foam::waveModel::New patchConstructorTable::iterator cstrIter = patchConstructorTablePtr_->find(modelType); - if (cstrIter == patchConstructorTablePtr_->end()) + if (!cstrIter.found()) { FatalIOErrorInFunction(waveDict) << "Unknown waveModel type "