diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
index 3570aebd8029fef323e0d868d0d94018f5bd63f7..6a6581182bbbacd58fe71bb8667fdee4f63efd54 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> 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 82411751fb1ecdd115e17cac6f80ba510981c50c..932080e71761b89b120fce4012831693b0eb8758 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> 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 0d7f1afcfb3a9ab9f1d3aab359a37510ceb34006..27fe3f5e17f1e37a4bd0c8bda24f5b412a3b8a6b 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> 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 a317eb50ec83deed7504d8d0a01f90bcf8e2c643..ed9dfb2fb3d46f9638a076091ea96d6badd19862 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> 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 b36e3f6e77eaebf3e5b70946d958d533dcfb40f0..99c33123e8d75663ba6752f3859e94532f041c48 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> 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 b6e7fbae004aae0ab796408d9ec34b4e739eab8e..c671c223dbf80c1f62f28286aa3649201ad394ec 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> 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 88497f622236937ce39cbb83f446539f5a76aa15..e4d71d2397ad6f7b5250596a0a86bd48bd63c306 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 0825368e5c16aa1b0d8e1937b9ce3b53812cbe09..c14fa08d59be5ea32d3fa204a14506247d7eb6f2 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 3bdd49ec7adcab61c16e1797c920822829fbc4e3..b880c4a6d34a9a8bda2a5965931a25fed3b82938 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> 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 deabfc900fab542019806c39501e4041d7d01b9a..b43d46f8a3d71b5461a8e1011e546413d0e7e6cb 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> 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 b58f00291bb73ba28e5b93a1f6c2331621eb8945..51e740788280f9837004065c12e3a252614f3121 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> 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 16b30556875e0689fcf85865495565ccdb3fefad..fee1253108be1e7481d70f8faa56185a7c9b8386 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 1251c98fe094acff86f883a6fad5b6e423bb07ef..3b349be6939828af40848995ab76fc77d8683c10 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> 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 920d7c62c8087d0ffe3f6a28a988744e14d46d4e..17fc43cac4280b85e3795ee922ee22a45abf86ee 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> 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 82359c05080f0691bb2eb5886e3b20cf230ed930..f14c0da92f5b6f9c615bae2521b71c2522ac60f5 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 568c1b268273864f8914b67d2fb227a1e7cfcf35..2946810cf5ff13e1564172b0143618de1ae4d67b 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 e077e31b2d38e5d6bb75ae402f0d5f5b57a922a6..c2a5f4074e731e968d92920abe99c52ba605d5d4 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> 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 8cdb07f29765d1e1ec2b121c3c8ac1ae1fdea947..46e43f6b11a9e253832b2fceab8cd524d24ab543 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> 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 3da4caee7cee85d3022e19d181db160e99f926aa..8dbdd5479c3a4bee3038cef438b947c346da58bc 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> 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 a7181b43968d0859efd2c69cc5018ee5049e0541..fb16d0541833fa0453f69095f8776d5a600e75cd 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 e440e3d1ee650d814e1fd2bd6ab571d9af70d7cc..53266ae6b2db068a89d828ab56aa5780a11d6832 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 4c4ced9ddc1b42046fe3079e3e52d6416a3a3a8f..1b092c197e9c0184092ce56f00d8f883998be5f8 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> 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 a5b0748679e7394ceb340e9d422af2ed0762d67c..83ad7b42e5437c463cbfbd32cc4737459d33710a 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> 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 08dfd7065daaac0310b8f56694d11cf83a27e7bc..806a1dd3b34897023a88a27c8a6aaa7e3e904777 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> 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 e2882355683182cd3f7b3f3d437c598b6a98e967..cbb33a5fbd0299ff9c01eaa35b19174229431622 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> 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 b58f00291bb73ba28e5b93a1f6c2331621eb8945..51e740788280f9837004065c12e3a252614f3121 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> 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 6c1ca526dbfb53dd6343f73b49c4125298c78a9e..c42b86070dacc6aca8aa994c691d35f4189c8578 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> 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 7ee24aa1aa6d5e3428fcfedab9a7f34e783132ce..0f116c70402a39763440c26e5c2dade9733c85a0 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> 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 45301ef6f80c584b8b260340407b27d934e3e08b..dcc0cc0d0f11b4138f98bec8312adb566ffad1f1 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 4902b329150396b49f5396f5681b1476e3c55da6..13987ff4b0924f751a3bfa3e73887241bb4d0661 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 486597787d9356d65562666b85861f4eb8f8a918..32f2d5a520d59211f7f411934b9170cfc34db99b 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 adfa944c9d0bfe15802382911f8c665ba2bc23d5..6cf6d1d64cda6fbe8c49c97a52a9b96ea307ba08 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 a878a0977319a96c1bc0ca2311da364045fec4be..bfadfc6399ce0d83f3f56b9a49c3e98606a60f5e 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 db6102174a24a098fa7087969f67acbca719369b..b68c03470f2c12225f178c169a60cdc2da2c3571 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 36b2c2b175ec15007558a51bea19fec6960175de..a1ce25337f71f85046461e94a63ea7e5ecb3f8d5 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 65f6c9ebb83c109055334cd0184beaa751fc143c..583ce1c3ad3e1f7e54aba3b5356929f5fabcad52 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 e79cbde0c17848e9969143745a3aebb51457b7e3..361850b414d6e1f6bdcf65a67ea84a24545db1f8 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 dd110902b1da8bfa1c50e041b738b81589ea81ac..dfbd95e6b2d757baee0d1c3c77d9a1cb4766e182 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 5477ae7c58bc0563d24adc55e406f95577f6995a..c2ca6358737700f5976caba090aadd55a5bbca55 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> 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 568c1b268273864f8914b67d2fb227a1e7cfcf35..2946810cf5ff13e1564172b0143618de1ae4d67b 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 e077e31b2d38e5d6bb75ae402f0d5f5b57a922a6..c2a5f4074e731e968d92920abe99c52ba605d5d4 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> 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 8cdb07f29765d1e1ec2b121c3c8ac1ae1fdea947..46e43f6b11a9e253832b2fceab8cd524d24ab543 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> 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 3da4caee7cee85d3022e19d181db160e99f926aa..8dbdd5479c3a4bee3038cef438b947c346da58bc 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> 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 a7181b43968d0859efd2c69cc5018ee5049e0541..fb16d0541833fa0453f69095f8776d5a600e75cd 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 e440e3d1ee650d814e1fd2bd6ab571d9af70d7cc..53266ae6b2db068a89d828ab56aa5780a11d6832 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 4c4ced9ddc1b42046fe3079e3e52d6416a3a3a8f..1b092c197e9c0184092ce56f00d8f883998be5f8 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> 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 08dfd7065daaac0310b8f56694d11cf83a27e7bc..806a1dd3b34897023a88a27c8a6aaa7e3e904777 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> 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 a878a0977319a96c1bc0ca2311da364045fec4be..bfadfc6399ce0d83f3f56b9a49c3e98606a60f5e 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 db6102174a24a098fa7087969f67acbca719369b..b68c03470f2c12225f178c169a60cdc2da2c3571 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 36b2c2b175ec15007558a51bea19fec6960175de..a1ce25337f71f85046461e94a63ea7e5ecb3f8d5 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 65f6c9ebb83c109055334cd0184beaa751fc143c..583ce1c3ad3e1f7e54aba3b5356929f5fabcad52 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 e79cbde0c17848e9969143745a3aebb51457b7e3..361850b414d6e1f6bdcf65a67ea84a24545db1f8 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 e2882355683182cd3f7b3f3d437c598b6a98e967..cbb33a5fbd0299ff9c01eaa35b19174229431622 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> 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 27fd28d68da2ce99a7916f583aeed885bed9d04b..fc011ece0c99be3ec20ac50c7718f0b9e0db6ab3 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 b58f00291bb73ba28e5b93a1f6c2331621eb8945..51e740788280f9837004065c12e3a252614f3121 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> 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 4551fe2c6f4da82178b7a989029a4f6616fd6d4a..15604c8867705a7a8ed7814c10a0fee8535f1669 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 c0db55e55864635d9b8d6c3750f5f93514037e8c..f2f93f2412c794eb94e595d1238c71a9f49bf506 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> 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 2e925b9b32cb2a44748f4cda2a9795da281338f6..93aa04c5abb95a94b00e69742633f61410f095f8 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> 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 cac183702182c5a1447640d5904df926647983de..2740fc1193d31bc21406c85c6f8696877d0ba776 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> 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 6388c0c6c88bfa3cf0030cd3f3a57b81cb90857c..2a6ccd8a3991a33c76fedfe4df8a819279ef0eca 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> 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 110078415529bba7455a326c297dbd25a68ed941..6a73347681fc2661d1432dfdd62ed9e1d8ae0b56 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> 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 e47cbf4aaa1cdc2c90d6d5e7ef6a552fdb7e7594..8086470c6e75c4d2aba4f1628435d09742f4d0fd 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> 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 16dc56814d581d6b95197aca93af7b72ac941efd..b35c37df1a5c5e442451f10be558425ed5d91883 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 84a7cea3c1fee3c60959c657eb24a2e76676c985..dd66f694aa34c960c02c324aa710f2e3484c5b72 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> 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 c6e45dd68828de4be3e6a8c7d085fee59e9eb058..3feb5f8659d93d5a2c7dc4d24840875e6a0bb301 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> 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 0c2c1a1924316234caddaf55e25e7e12a4fc5b6c..b4d67de9e2e2efc5a4776fc0db601fd961a14fc3 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> 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 d62fb05927eb1f62420f8f73894da37d9ec51e98..a3dc719dc8e51ddd2fde7867aaccb489bf0413e8 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 0774ac7de0cbafea746f2d1579d67f296b8d2404..20d6bc883143b23b2f20b3ef0039836a29ee3a39 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
+++ b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C
@@ -39,7 +39,7 @@ Foam::autoPtr<Foam::ODESolver> 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 59c551b6f83b4099923ecb5a532dba612e66e0aa..7e8b7ed141a79f11c18a2674cfccf34ce7332927 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> 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 5837bd5773133b5f82e009fdbe3f5e5623cc10a5..f91ee70bf65d6c5f21b4d1a245d0860563d896c8 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 4ce4821b46426a12f956665a6196dbd7dba25947..a7af08b8ef06491f16737358e1fc61d0fe9ac474 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> 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 2d48607cce315a73ebbe4479a52f53b4a723612a..47a8a8c3ce7411fddff201e3ea5151bf7fe1bbed 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<Type>::NewCalculatedType
typename pointPatchConstructorTable::iterator patchTypeCstrIter =
pointPatchConstructorTablePtr_->find(pf.patch().type());
- if (patchTypeCstrIter != pointPatchConstructorTablePtr_->end())
+ if (patchTypeCstrIter.found())
{
return autoPtr<pointPatchField<Type>>
(
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
index 277f4c540719f70ae085edd13bd31ec5b6111681..79d90cf3a2e3adb7caa143aaa6e2dc8c18f24be4 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<Type>> Foam::pointPatchField<Type>::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<Type>> Foam::pointPatchField<Type>::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<Type>> Foam::pointPatchField<Type>::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<Type>> Foam::pointPatchField<Type>::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<Type>> Foam::pointPatchField<Type>::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 5eb1599d6e4658a6c76a4068dd6fa7632ca9b86f..e21540d1851ac28ca4d100221a40fcb9450a4a65 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -215,7 +215,7 @@ Foam::autoPtr<Foam::graph::writer> 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 3955291941e6c51053acb6acd5f27093fc0dbd15..58060e89fe3942789c58003db446b1a4c9c4b482 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<Type>> Foam::tableReader<Type>::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 39bfb0bcc3f958dc71ba181c4277c035c20b0553..59dd7cc0fdfc48b97291aa82ad4fbdc535dbb367 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
@@ -67,7 +67,7 @@ autoPtr<interpolationWeights> 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 fd21dc3983c9fe87ad343e6595a03d9a06ea4963..8e1aa10b79c34d256cbc292d59b2eb3556a14167 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
@@ -42,7 +42,7 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
typename symMatrixConstructorTable::iterator constructorIter =
symMatrixConstructorTablePtr_->find(preconditionerName);
- if (constructorIter == symMatrixConstructorTablePtr_->end())
+ if (!constructorIter.found())
{
FatalIOErrorInFunction
(
@@ -68,7 +68,7 @@ Foam::LduMatrix<Type, DType, LUType>::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 d05203afc1683bebf81a828eab1f8da2b0e48054..195871e41fb3b03b49897e84c617ba40041b07cb 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
@@ -43,7 +43,7 @@ Foam::LduMatrix<Type, DType, LUType>::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<Type, DType, LUType>::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 651be6cee2828b0e31003bef43a034ad2bd24d09..aebe9cb16f228c29f4b8d7c29502796bc3cb0782 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
@@ -56,7 +56,7 @@ Foam::LduMatrix<Type, DType, LUType>::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<Type, DType, LUType>::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 727f400a72d8883449590a4ecb1ba565fb4dd56c..36d85e76e838094304e452fcfc3029a82bdeeae7 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 3d3e3bbad0c0800dca96e2fe284ff942b7d6ae53..4692df969be7e66286ed3c723bb3d080672d08dd 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> 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> 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 a2ba3ea4634aa59e450a4bb9ab8e77b7339b6d96..88c57332441ca503e78775c4c9b416774cf01969 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> 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> 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 21520669da5467b972f404b4e547b2233bcf0825..d0168688fa29d7666fcc6d773fff039275a0da29 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> 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 926dd147246f0132d87ff3fa43188abe9efdaaf2..0f8ababa3aabfe9efbc4e2cdf2d18ff20ddb3fd7 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> 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 2a69e4dd00eb1d528e1118c32dd20949fb079195..dda2e9024dba6b75d1724ed0e3b7025e895c9ebf 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> 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> 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 5130ad12f84b45e66b77b28a93501ddcd6735209..686fe2094e2f37328a0b1be4aac3d737912382a1 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> 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> 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 8969bacec96275b11657501acd171ccc911cf21c..69e76fe3b6c7b13528c767beedb776a87910117a 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> 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 e44810932dbf0f698add039376d967fb9667b7c6..97d8f602c08a5d2fb0da46258eac52c38bd2b131 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> 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> 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 fd6ed39cdd55d3450c50cd58632bcbd4fc7bcf03..2281285c074a78269f83ceccc8534baf2d20cc33 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> 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 2b6954b340c110826b2c8d3515e7746843fccc96..b7d1e7a8d91552606863ebb417ba241c24701560 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> 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 3c5feac399e7060575d11b35ac4803ff9c465f13..e17d645b4ab98ddd7108be1016220bec8690f8f4 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> 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 81d45654011eb390d47b8013d2aedf0a0604bbc3..5a965acbecc25dfafd2dd8e3c6cb2badc874a6b1 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<Type>> Foam::Function1<Type>::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 c5cc7ebdb70fc625cd9e5604035ae4dd83030b6a..6d449e0698d80c57b240883a8be8e262446343eb 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -156,7 +156,7 @@ Foam::LESModel<BasicTurbulenceModel>::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 b799237a36b09739abaa992fdbc7711f95df1317..0f0cafba0b5e7aa07067da7511a05b0d6b68bb3c 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> 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> 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 6f614f0d911f4b4a22db3520241ee6ffc6face08..dba84f07f8cd1cd34b7161b57602adf5bb0067e7 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> 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 d95f2bffb3f3f0e0d9d101d89a029b537aef2809..1937ef097b27077a5abd4f9523339a68d239bdf9 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -146,7 +146,7 @@ Foam::RASModel<BasicTurbulenceModel>::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 30d4d31921b3c4d223e3bc76c3997ae8a4461f2e..8593c72df514cb4093cd619e8737beb4277b30e6 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
@@ -108,7 +108,7 @@ Foam::TurbulenceModel<Alpha, Rho, BasicTurbulenceModel, TransportModel>::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 0bd0bb49e3a536ff441a93aed0b00b59b153d384..82675e8bb45d4879eef74e6446501cc3a3aea0c4 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
@@ -117,7 +117,7 @@ Foam::laminarModel<BasicTurbulenceModel>::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 8b5905ca4aaeadec7f44f07f724d80a823f467a1..cefaf8a1274ef217f8a661b58455603f8d3a82f0 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> 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 6c06cf881d958a73a874b5ce302483fc23bba3ad..76c2fb76aeb7ee11500bf7700d58c6bee9eac99e 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 e179f04141b59b6e3f2fb6725a22a9a9eae643e2..6060d2acc595708c1aa286713a5f2309e9bf0a62 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 fa05cc2a5995cc3989e3a8884a334e4a376e130d..d9edadcc3f549c865847d713e9ba7674173b8ade 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C
@@ -71,7 +71,7 @@ Foam::autoPtr<Foam::dynamicFvMesh> 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 cf34d6eb70c76a9fbd49b57d71bb8b2f9b12f0a1..629d16a478f4dd6f342c113a79b63c4251f21b11 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::cellLooper> 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 a8797b3cd973d06f15679e1094a273ad34225b9c..6a8dbe3640eb9e6f9a22096b40fd7618f69fdb53 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 dfb9d5e1f37fe98ff810baa23610ca7587282714..911c888101a2a4b6866445ea8f5e2f0315a07848 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> 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 a637338472ef24de23fdf26fa5ff6122fe9ed6db..943c227b87e1e224917eb8cdc7ae1bb6a00f6029 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -125,7 +125,7 @@ Foam::autoPtr<Foam::motionSolver> 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 e85f4d59593f373a967131ee9176b0548e3bda98..f445f1a348d138ee15d6eaf66f943c5ca28b84b9 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::polyMeshModifier> 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 6b4dd6f3820c2613eb31a37174a520a19687b7a2..64f918b1938499fd96d25b9dc4d4b9608d85d516 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 8258da4b57b153b5fe88a60c83c8002b18e3f09c..608c5033df7698173601d869f73ee8efaafbbfb6 100644
--- a/src/edgeMesh/edgeMeshNew.C
+++ b/src/edgeMesh/edgeMeshNew.C
@@ -36,7 +36,7 @@ Foam::autoPtr<Foam::edgeMesh> 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 ad0c52966ec3503285e19a33c4efc8350c59dce2..96ca550f8b5fd6228714ad0ab1890b0177ea808e 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshNew.C
@@ -45,7 +45,7 @@ Foam::autoPtr<Foam::extendedEdgeMesh> 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 afbd4218290d81c23f5a611401c600c7873805f5..8d074d8e9ce0824f829f8a85d4a2cf51610b7222 100644
--- a/src/engine/engineMesh/engineMesh/engineMeshNew.C
+++ b/src/engine/engineMesh/engineMesh/engineMeshNew.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::engineMesh> 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 afc3603dabd3372b49e2629d47fa2a1a9a6712c2..64b9743203fedf6e118a25a5dfca202c673deae5 100644
--- a/src/fileFormats/sampledSetWriters/writer.C
+++ b/src/fileFormats/sampledSetWriters/writer.C
@@ -39,7 +39,7 @@ Foam::autoPtr<Foam::writer<Type>> Foam::writer<Type>::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 afcf8cef5195e19084f924c3979a3c812a1eb2c2..ce5a5d148b1483de699e88014e87bb7dd94fb0a0 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> 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 d6ccd5c66b482bcd57a781594b2936e02d976da8..1f51c3d00a6eddf8c81b3842fa54ada3c3a05e84 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> 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 592ff1f961cc9b503ef7e6302a52f23776f49b93..e45f4a2964d2c38122b68806d84aa9e98c3e3c37 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> 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 c3677cc0d0fd8ab42dcf3fb424b91ddb67efb447..0f205cd057023fbe454a872a336ba70ff17e33f6 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<Type>::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 537881840b713e163febedf3c4c6ab22096cacd4..664f3ca2f28bc51fe9ed5217884f5e3e2662daae 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<Type>> Foam::fvPatchField<Type>::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<Type>> Foam::fvPatchField<Type>::New
|| actualPatchType != p.type()
)
{
- if (patchTypeCstrIter != patchConstructorTablePtr_->end())
+ if (patchTypeCstrIter.found())
{
return patchTypeCstrIter()(p, iF);
}
@@ -78,7 +78,7 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
tmp<fvPatchField<Type>> 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<Type>> Foam::fvPatchField<Type>::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<Type>> Foam::fvPatchField<Type>::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 5202908f9840ae5f9a94942d26f8bc80b9e123fc..fcfbb1dae1edfd6b6174cc1f5f0eacd83fa5d053 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<Type>::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 9becf00ccfd1fea99e29a16e0f5831dd7d12271e..32c567f95d051852be424603dc310bbac09335cc 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<Type>> Foam::fvsPatchField<Type>::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<Type>> Foam::fvsPatchField<Type>::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<Type>> Foam::fvsPatchField<Type>::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<Type>> Foam::fvsPatchField<Type>::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<Type>> Foam::fvsPatchField<Type>::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 a3ba465414560a473682c7a5211a8925ad494e73..a8539a5c48a54230a765964a1898950d8272d35c 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -82,7 +82,7 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
typename IstreamConstructorTable::iterator cstrIter =
IstreamConstructorTablePtr_->find(schemeName);
- if (cstrIter == IstreamConstructorTablePtr_->end())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -128,7 +128,7 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::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 8113fed871d1d2642ddd801b3b7badb9282179f8..d9c7091e6b34c9a9d6627dc1547b03a780ce548a 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -69,7 +69,7 @@ tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::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 98d0ec1057b7ff7c957521d2f1bc36f640bfe38f..03c205567318cbd271d6a645825162a7637349d9 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -69,7 +69,7 @@ tmp<ddtScheme<Type>> ddtScheme<Type>::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 17c042539ac4bf66a2251cd8e7c0f558d4b541af..af586b63a52d5dc82058ef44baca4ec1ef60bc41 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -70,7 +70,7 @@ tmp<divScheme<Type>> divScheme<Type>::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 2c045538e2eb590a4a3f08b2837daf977a9a64b1..4358fab0292d57f5afdad77c85b9cc0f8dc6de26 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<Type>> Foam::fv::gradScheme<Type>::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 fc24a6221e3646b8cf51d4d51e045a28034844d2..f7832287548e0f83df605e5dd11f89514cd938b1 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -68,7 +68,7 @@ tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::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 2ad75944f449153e66d68ad9e3c115d8d6368b8e..ae7d0de4585474b8f04bd671b301a69e7c8964e8 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -70,7 +70,7 @@ tmp<snGradScheme<Type>> snGradScheme<Type>::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 ad52725ee9eb86e8503b88cd007ed542981ee2f4..468b9b88f60a798e5aa4564e54ba3c8c1f61d2b1 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> 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 c4c6432e116d8efcbbbfab05497efe378d9ccc40..349d356497049896916094d32bc5439b7961a2e0 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> 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> 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 99544f2e6a1faec3d3d3a3a0b73b4513b1f3610e..decc033fe599292987a00d67694d43807a0c7218 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<Type>> Foam::interpolation<Type>::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 62d3b3903e45c232e3185ef18ca2712f7d1a6500..fae9dddca3969a6a78968f78f9d45cff92aac7ee 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<Type>::New
typename MeshConstructorTable::iterator constructorIter =
MeshConstructorTablePtr_->find(schemeName);
- if (constructorIter == MeshConstructorTablePtr_->end())
+ if (!constructorIter.found())
{
FatalIOErrorInFunction
(
@@ -110,7 +110,7 @@ Foam::limitedSurfaceInterpolationScheme<Type>::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 62288018b0cd21861361a54470e52d9cd4287381..ea3017016ba04be9ce6a4cbc076892f9360522a9 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<Type>::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 8d7074174fb214d36f1fa055249fe110dfbf5d6e..089d21bee2fae6ad72b7dcf9fd97127d06413a6a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -61,7 +61,7 @@ Foam::surfaceInterpolationScheme<Type>::New
typename MeshConstructorTable::iterator constructorIter =
MeshConstructorTablePtr_->find(schemeName);
- if (constructorIter == MeshConstructorTablePtr_->end())
+ if (!constructorIter.found())
{
FatalIOErrorInFunction
(
@@ -109,7 +109,7 @@ Foam::surfaceInterpolationScheme<Type>::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 07d96c8ba38e006bd200df4ea31ae428af4b089e..270859347ed65636cd10654622edc84a984dd7ab 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 aba780e5ed9741ebba4eeb98658ecf443a4d5c41..aedd860827b9d7d2d74ffbc1af594d1cf0d6fd98 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 c5581a600137eed85554bd9f5fa75e4172e7691b..94c289d1f7b06177863624cd937e5de74f9bd212 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
@@ -153,7 +153,7 @@ Foam::autoPtr<Foam::functionObjects::runTimePostPro::pointData> 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 903f0c24b639600c964994a1e94983dc3148d6e3..5c0383c4abeff1c54fc29adfdcb9f65a1b69159f 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 e97e428ad6048f8f968fd312167c70a7e049c047..85192b98ec60e97ef431f429cecf8c51db575dcd 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 4c01a9ebf73caaadbfc4223d554b6d46459d4e8c..161c424b26aa1271eb202728f11064d37df9852e 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
@@ -57,7 +57,7 @@ Foam::autoPtr<Foam::motionDiffusivity> 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 4e73a2cd4b90bc98ae133b05214623757a9bb2d2..c59808a21b5da47c1ddb9529d4a0bc313af6350d 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 8934fa53ad27554a7aba0f60c2793d6469fef12d..c4f4b1a1ceb5468ffa00db8e4162a8462db43d5e 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> 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 e8c01c639b129cfc727eff75f4256ec98c482031..92b0b09f5ce515059d18ca99f97a510890f6fd88 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> 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 d01df91c787f9fd6252569af51dd84d9b41ae12b..43488462bdf0afb7bf78ad97a6714ca4c48b31ea 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<CloudType>::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 4527542382c8e16b1dfa4da331fcdc53645f5877..fb67a50e0a700895c70eedfd89a42cb60825b61c 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<CloudType>::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 1652caac6c6fd3c07a6dd0b692c7be649dc001a6..55a134367eab362c76cb7e480d50840b0a83906c 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<CloudType>::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 e458085a438b7e75b5995662c21b9036793dafc4..d5d3132187cba0fb0480cbcb733661577e047404 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 b85a24c61be3adccddaabfbfb64549fa92575b3c..1c84dc5ae9ddfac2c9c3717314f70c3675eb4d7e 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
@@ -44,7 +44,7 @@ Foam::IntegrationScheme<Type>::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 1a5998b391440a6d3262691a0fcd676098c2ed95..1b115c6c264853c6457401b3fabc1da2c5086c5e 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<CloudType>::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 3237690f6f151ae279d108a07fde512d3fcf161d..8548abfc76cf2659a61ba5aa9b73b26292a6d818 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<CloudType>::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 a9f5b47f5c5b720c10441a95e1212d14883d65c9..f98062e8e1f5fade9c96b0ba2af46f68d2c382c9 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<CloudType>::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 ec49454ff1c113fbc2a5ae55b9c2f19c1750e158..21b9f57318ddee14f3445f0d24aca267183c6a52 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<CloudType>::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 70422ee16b86965c5725210bf920a0bd65725f94..f8c1f4f5388f707ba24a76f0a2fe44baf58094a7 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<CloudType>::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 934b86f17f2dd344bdf8b5266e84230f4e1892d4..b60c2e0031d6ff0bfba0b3ebb828130bc0371655 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<CloudType>::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<CloudType>::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 d30f34bb99bb9065992c546fe1a2bfbe2d68c5df..a4f1db04b5fa9380b6e852333a0a6991ea644305 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<CloudType>::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 1c711dba1187d4f745f76c0c981e66651e464bf8..19611a30b8e53f16350fda8b1267721a3f989f5b 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<CloudType>::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 9faff867b59cea9899edbd3cecc6802a13a4b799..3364416bbbed6396ee6a92646dffc9b7581b2bc3 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<CloudType>::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 516641d06649c95b7dc4bbb13064622cfc435712..7344b41f77cb7ae52b6715f3e44d5309e032620e 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<CloudType>::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 f6833065856ab21240a8724ee6f63a64841f14b7..c64b12115af2129e11721d0fb08bcec011c459ca 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<Type>::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 a7ac4c363838b7a4243aeba3d25a1263f0babb95..d958d1a146a2019721d62399f0da617ef22ea996 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 3c33ee10844c006026edaefda152bea2d08df4e9..8d7836cb2bd2d1010e0737fa3a9ed536daa4448a 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<CloudType>::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 d11cfb7a13403d002ff69a1ede384778a6164ddd..c8b02261b8492a35859c9e2427aca0ec5a28899e 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<CloudType>::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 38187b8e3a6c4b71e5adfee255c36868b4d6d3b8..136c13eff44296e295b866d695cce9414902db33 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<CloudType>::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 7f9509e8989221b089873cc63c8db82424f4dd07..29e95f3095b86d00d59fdad49d9bf964f93f9633 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> 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 c700a01efca3e35d6a48eefcdd2c28c62679f89a..6502846403fdb8716190f0862aeb2630801eff3f 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> 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 0323115fd799d2887254a79ada5ad4bcc2b5fe29..3ed57d2d480ef767e3bf0490dacfc6904be2a1c9 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<CloudType>::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 bf8ff340bcb7d8e88fb93c7d064d123555d62489..8f85b5298e49d052fe7646d1fa88c7879987eb89 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<CloudType>::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 4388b0498670e6998c858a72085a9387802e0a1c..195a955fbf4d4699417a496f52b9c94fc396e75c 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<CloudType>::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 4fd894b93c96745c78780eca8eb10b18bbc25bb6..f57f768e95ab5a3731c6140fdaf5712c97e039c4 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<CloudType>::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 6fae8667d23f329915a1fdb34fc12bd1bd35cf13..6396e4c6988f68a1594e7d336177f3b95805b08e 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<CloudType>::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 0ea36b20e0449351f17a109b059d5da4dad7482e..fdc1b1bfd8cdf50d9bac8d103f3c867fa7758893 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> 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 ff3f92568220ca380698a25a6febc3d21aafb290..a6ed6c1e2c9ea5e99050c2efd23bbc4f9d5af64a 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> 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 58da03728d823e7cede07b48c7dfec05b219def3..55d1f6864abffa3c015856c39fc66d81c32d5cda 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> 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 475f66f088ad0c724dbea3bfcfaaf2ad1ba7992c..55628958411eb68939fa1a4ff457ce4668906d57 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<CloudType>::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 649b465b29407028018440f2ab018631d77793d2..25a1e75d69315f32f39902d6bd696bad894aea1b 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<CloudType>::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 12f63a3057d33f6c14f708305e7120dd09aa9ea4..fd5301739420ba21184512f216c5e1c15bac26b9 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> 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 7f777b8a8031e5a362e71320b670781d4945a2b3..cec92a091a9c237b46c5f529305362934dcd0c6b 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> 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 fba46625b14df8787e1e8b6fb0d09e5f5de689f4..3593a69ec8735408ba39cf05f1f48f613f41065d 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> 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 5d75aa5574f40903e41c973e6cd79b3623252eb2..96e8c5d4c1077c083da3943bbc2c1f70b94bfc2b 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> Foam::block::New
IstreamConstructorTable::iterator cstrIter =
IstreamConstructorTablePtr_->find(blockOrCellShapeType);
- if (cstrIter == IstreamConstructorTablePtr_->end())
+ if (!cstrIter.found())
{
is.putBack(blockOrCellShapeType);
return autoPtr<block>(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 010ddc4de4e02f2c5364cb2fc220522b7a1514c5..570a4518d3d7fa32e262b9215270069aba5bc539 100644
--- a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
+++ b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
@@ -39,7 +39,7 @@ Foam::autoPtr<Foam::extrudeModel> 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 b5100a4e8a8e354730232c7be542a96dc0632999..5b945d5164d5e256fe34aa458be405e666a20cbd 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 a16a91fa6bd669add27049e2823b55fdea47f82c..c43a03c950c184c54975943071adfb2cef436014 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<SourcePatch, TargetPatch>::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 59f3e520cbf9f93c074c169ad08ccba8b2c4fc37..34b169cf0e7baf13a846da904e17697383789b66 100644
--- a/src/meshTools/coordinateSystems/coordinateSystemNew.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -40,7 +40,7 @@ Foam::autoPtr<Foam::coordinateSystem> 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 0f5fe77decb1c50575a61645117812c0c7a8813f..ac9b9daab0b949ef3b621438451dc3bafbe0b7b4 100644
--- a/src/meshTools/searchableSurface/searchableSurface.C
+++ b/src/meshTools/searchableSurface/searchableSurface.C
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::searchableSurface> 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 216c417c64e0f62c98e41badb96b30e991791aed..b20ddfbd49bd7f69b6306ad95ada79e748d2006d 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -80,7 +80,7 @@ Foam::autoPtr<Foam::topoSetSource> 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> 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 cc65eb8097e075fd63845f991507a64e76a4bcc8..ca2e6d7bbc8cc4d4669881d7811f66592598a692 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -54,7 +54,7 @@ Foam::autoPtr<Foam::topoSet> 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> 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> 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 1a4e31de0b06cc7e5ebd51c6ede4e27bc5b79be5..3f6e7f60027950ea023816e7586c6e0e5cc8a17f 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 6430ff9b41d3f37da0d0f0bb771d493d490da526..984851df718c7b9ab96107d1e97aadb720f292ee 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> 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 3f5fa4f25f8e38d716767f947bdf1f7a070e09f3..72f06f764926b51827022e7dac27afe84bff0343 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> 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 68aed5d766ed2c004587f0b737e020cde9cb2e62..d4dd15b07ed81f0e9e2e39ca16eeff3d40c28d7f 100644
--- a/src/randomProcesses/windowModels/windowModel/windowModelNew.C
+++ b/src/randomProcesses/windowModels/windowModel/windowModelNew.C
@@ -40,7 +40,7 @@ Foam::autoPtr<Foam::windowModel> 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 ea38a60f47e8102da7829944c95150c3cb0e6472..85db5ce6c807270094f52878ccbee47285b4337f 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C
@@ -66,7 +66,7 @@ autoPtr<pyrolysisModel> 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> 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 3b41bc8d3bc1305d37ef4cb7e3e0f3b92d372ea6..8c4b1bce3488587cfaa6de015ee3a95735553b67 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 f177c506ac696badc6eaac1ad7ac39e38a3f0dbc..67baf4f6c1fea15fcd2569929c301ddbe9172378 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> 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 4485b6c87b5b45162cd67cd0501f05e6df12ca0e..a138fa6a68895c625316e6c60e54f6a46648b367 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> 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 c8c71f5888bfc487d0f8695283331f9746d04f81..4ce1b6608ded317913b31371d48650c506ea4d4e 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> 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 dcb17eec8dd95e20a88692ebda9457ffeb0462df..b06590a55c4e239ab2e9d2cf2f9780eaae2a1ff7 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> 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 7167b32e49d12509b79f5a9cf82ba2629d795cc6..781f1778efb313cd0f6ea3bbd353937f5c4623ac 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> 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 daba92d47c4b99ef01e653bc399452673e079605..25be0a0c28dc1bd315b8bd234c9b3d345b7c0183 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> 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 41df73789c6a408e78ace97d6bf28126396aec75..52b1870390d7047ef97be99fadb8974a0a78ba38 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> 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 e673ca36b2896f0ab8b05d69272f546075fb5464..add63599f3421895b6a0e4963171aba264433ae2 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> 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 cfd451d459675de34bb70cfe096bce64d061d5cb..91b7639d9c00f58e1e553ec926d685dd70a1ceac 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
@@ -69,7 +69,7 @@ autoPtr<surfaceFilmModel> 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 30703d258f63e40e0f4f86c428b58a9b1fe8ed6b..6a9f88a1f09c564d39b5f5edcf9459c295a4d918 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
@@ -64,7 +64,7 @@ autoPtr<thermalBaffleModel> 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> 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 ab9980287a33503e05b414cf593d22a72ce847eb..8c91320221a3377d64f0569e3c5ea4a77edb4c11 100644
--- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
+++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C
@@ -51,7 +51,7 @@ Foam::autoPtr<Foam::renumberMethod> 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 ef744a5a0abbadb7c824ecb832506057bd4796e7..20ba5e14239cc12493295c6c6bf30cb856796cdc 100644
--- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
+++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C
@@ -79,7 +79,7 @@ Foam::autoPtr<Foam::RBD::rigidBody> 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 f13ee347ea9ffd7500b133a5a4f020e271a590de..f5a89e9b72019a4520d377562b7cb55481065223 100644
--- a/src/rigidBodyDynamics/joints/joint/joint.C
+++ b/src/rigidBodyDynamics/joints/joint/joint.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::RBD::joint> 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 ee8e0f2f1c844e8a7bc65e8d018d81cedf37bb05..ba95967324a7833686d9a41572838e0fd6183a9a 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 8db7777f7758d5dbf7f6d857515dbdbcc05d39bf..0a24730e7ebd29ebe8a5cc6744def0d7ed26d8db 100644
--- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
+++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C
@@ -40,7 +40,7 @@ Foam::autoPtr<Foam::RBD::rigidBodySolver> 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 5eaf5e3d3b4922f44df1c30d36957901190c8942..c315dfc76b7e2b6457dd9b0b45ce3bb6d9bc95d7 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> 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 f583aaea86d7685eb423b16a50bedecbf0e64601..cab0f3eb1328f62ab4b47ee9deebe288388a2107 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -451,7 +451,7 @@ Foam::autoPtr<Foam::sampledSet> 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 415179e2735db4020733ffa34c210ec051c30ecb..9a360611f38a55650086e7f2aae1568051352995 100644
--- a/src/sampling/sampledSurface/readers/surfaceReaderNew.C
+++ b/src/sampling/sampledSurface/readers/surfaceReaderNew.C
@@ -36,7 +36,7 @@ Foam::autoPtr<Foam::surfaceReader> 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 ddaea516a07d549cbcca84d743481d154d6c2d4d..0901dc4c94150b02a2f5d1b787911377fd09ccf6 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::sampledSurface> 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 bba94f1e57106315b785d0d3213b5bd9af2fb2a8..355f6431bf220155dcc4fc87a080f20516e90a24 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<face>::canWriteType(writeType))
{
@@ -66,7 +66,7 @@ Foam::surfaceWriter::New(const word& writeType)
return autoPtr<surfaceWriter>(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 a26a3e1623c8b311d4dc5f486a865dc98e36ad16..dffee65df23af2f3487849b4d546dc8953d796a5 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 9173e2fb810fc92f7260b600d9ed58dd66aa51de..6200cdcc673b0c9fb8035ed5789cf166fa250c4f 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 3398826611d93e6558d9faed123825e6c10b561f..864e8eee8c5ef055488f6ba7cd32ef63e7519097 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 d9d92826c70af0f00b5d9de7497be5babf5883fd..44e4f0b58eec38e92d80a61e8ba8406d1a226b0b 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C
@@ -40,7 +40,7 @@ Foam::autoPtr<Foam::sixDoFSolver> 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 c37b8ec0332d23585ed191330ce9331d255c2784..3ba0e8e5c1c13ff77ba5173ea09bf31860b371ec 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 37c7044ecdd5652af69c4f2d9c7aa1d87508e929..bdc0a3e2a7f1101f1a29aa448f631317b8825090 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<CompType, ThermoType>::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 269613d1d0723e7f0897741de35a9553286030a5..a7f9268d3edc19945ddedc1778bcfb33b34162c0 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<CompType, ThermoType>::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 a92ced331e7f6ebd9e9d10f26e31d5773794a8f9..b0e72f1c5ecdc3a19cf0422615eadef52efeb7d9 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
@@ -126,7 +126,7 @@ Foam::autoPtr<ChemistryModel> 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<ChemistryModel> 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 5b31f20d10484cf767fd0949f9ac6bcaca86302e..74c87d4dd5d44a5f03e12629b11624140c152697 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C
@@ -53,7 +53,7 @@ Foam::autoPtr<Foam::laminarFlameSpeed> 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 57f6e78955392c608d257cf6bf5f8ad233fa9833..b7190cff5162f2925f5ac6637c557504652816fc 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> 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> 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> 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 e9c34b5726ba4ae55ad55974424903d87306d304..259c6c01da96ca0603a69da72a980d60ed271c8d 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> 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> 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 9e371d2489facdab1e7e01f72a677237f8ba6dd6..9b730c22286be55b13a4bcda8c43e3d22d0e4cbf 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 c509e25d9e718e3a063a790f8354611f9d1042f7..0705302b45fba59949be83c30a866415109f2a96 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 9f6951323c99249843187fecddd8313b1f7183b6..ab825045bccf44624b03d8a364ea479746794d0c 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> 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 c7807b4241104abdf8340c3522a55235e398eeab..18718705913ae292d2c4bcd39e675e47bc2e4cc7 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 897895d7f3f7662d76ed828bd7d7d9a86bad11ae..07298ef596c48f8a029e93e10cf2d72607a7d88e 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 22c5f63f0b188eaf0ada05045d6183a80dd1610f..c0d9e3f7af89ff845d235835b2d46c2cb92b844d 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
@@ -47,7 +47,7 @@ Foam::chemistryReader<ThermoType>::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 12a5d39fa377b7e922c17321a31540ff44a5d417..5ac8e03ef3abc3414c38d06ecd6b6688ec57777e 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 8dff4ef9380777270ac60e2b6c526826ef7a3dbf..6df600099fa13f57f66d7bc133caa2df2ce59552 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<ReactionThermo>::New
typename IstreamConstructorTable::iterator cstrIter
= IstreamConstructorTablePtr_->find(reactionTypeName);
- if (cstrIter == IstreamConstructorTablePtr_->end())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -412,7 +412,7 @@ Foam::Reaction<ReactionThermo>::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 23377cd6925f8af32a64518c8e911c29a773fb40..df4dcff09e6538bc8eb0d0f6b323c39a124a37c9 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> 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 60446418e577dcc2c7eafe42ec6e71fa8335b094..b47ea482171c2443d14a69cd99d43c3f4d851888 100644
--- a/src/waveModels/waveModel/waveModelNew.C
+++ b/src/waveModels/waveModel/waveModelNew.C
@@ -65,7 +65,7 @@ Foam::autoPtr<Foam::waveModel> Foam::waveModel::New
patchConstructorTable::iterator cstrIter =
patchConstructorTablePtr_->find(modelType);
- if (cstrIter == patchConstructorTablePtr_->end())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction(waveDict)
<< "Unknown waveModel type "