diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index 44b585b880..7c1caaa1d5 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -48,7 +48,7 @@ Foam::XiEqModel::XiEqModel ( XiEqProperties.subDict ( - word(XiEqProperties.lookup("XiEqModel")) + "Coeffs" + XiEqProperties.get("XiEqModel") + "Coeffs" ) ), thermo_(thermo), diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C index 251d429c8f..1c9e935c8f 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C @@ -35,7 +35,7 @@ Foam::autoPtr Foam::XiEqModel::New const volScalarField& Su ) { - const word modelType(propDict.lookup("XiEqModel")); + const word modelType(propDict.get("XiEqModel")); Info<< "Selecting flame-wrinkling model " << modelType << endl; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C index 217242b24b..883843a857 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C @@ -48,7 +48,7 @@ Foam::XiGModel::XiGModel ( XiGProperties.subDict ( - word(XiGProperties.lookup("XiGModel")) + "Coeffs" + XiGProperties.get("XiGModel") + "Coeffs" ) ), thermo_(thermo), diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C index b46192ea38..8b3c5a4881 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C @@ -35,7 +35,7 @@ Foam::autoPtr Foam::XiGModel::New const volScalarField& Su ) { - const word modelType(propDict.lookup("XiGModel")); + const word modelType(propDict.get("XiGModel")); Info<< "Selecting flame-wrinkling model " << modelType << endl; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C index 9580728905..0337093ec1 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C @@ -51,7 +51,7 @@ Foam::XiModel::XiModel ( XiProperties.subDict ( - word(XiProperties.lookup("XiModel")) + "Coeffs" + XiProperties.get("XiModel") + "Coeffs" ) ), thermo_(thermo), diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C index c2dccb0180..4eaad2b82d 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C @@ -38,7 +38,7 @@ Foam::autoPtr Foam::XiModel::New const surfaceScalarField& phi ) { - const word modelType(propDict.lookup("XiModel")); + const word modelType(propDict.get("XiModel")); Info<< "Selecting flame-wrinkling model " << modelType << endl; diff --git a/applications/solvers/combustion/chemFoam/readInitialConditions.H b/applications/solvers/combustion/chemFoam/readInitialConditions.H index c321fcbf3b..e5f0599cee 100644 --- a/applications/solvers/combustion/chemFoam/readInitialConditions.H +++ b/applications/solvers/combustion/chemFoam/readInitialConditions.H @@ -1,13 +1,13 @@ - word constProp(initialConditions.lookup("constantProperty")); - if ((constProp != "pressure") && (constProp != "volume")) + word constProp(initialConditions.get("constantProperty")); + if (constProp != "pressure" && constProp != "volume") { FatalError << "in initialConditions, unknown constantProperty type " << constProp << nl << " Valid types are: pressure volume." << abort(FatalError); } - word fractionBasis(initialConditions.lookup("fractionBasis")); - if ((fractionBasis != "mass") && (fractionBasis != "mole")) + word fractionBasis(initialConditions.get("fractionBasis")); + if (fractionBasis != "mass" && fractionBasis != "mole") { FatalError << "in initialConditions, unknown fractionBasis type " << nl << "Valid types are: mass or mole." diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index ded747d608..7d8fba8619 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -8,7 +8,7 @@ SLGThermo slgThermo(mesh, thermo); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index 6efaf1eb8d..4c9f34015d 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -8,7 +8,7 @@ thermo.validate(args.executable(), "h", "e"); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index 4bdfc46d4f..94b40e98dd 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -8,7 +8,7 @@ thermo.validate(args.executable(), "h", "e"); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H index 95524e04ef..edd528174b 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H @@ -8,7 +8,7 @@ thermo.validate(args.executable(), "h", "e"); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H index 6c67f6b9c0..e5f5ba2094 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H @@ -11,7 +11,7 @@ label inertIndex = -1; if (Y.size()) { - const word inertSpecie(thermo.lookup("inertSpecie")); + const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index 3ea11e9ccc..c0c21a15dc 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -12,7 +12,7 @@ SLGThermo slgThermo(mesh, thermo); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index 7cecbb45c4..eee7772c23 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -10,7 +10,7 @@ SLGThermo slgThermo(mesh, thermo); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H index 1b28e78f1f..0e2ba2f1c0 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H @@ -10,7 +10,7 @@ SLGThermo slgThermo(mesh, thermo); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H index 3c0985f95d..108d78556f 100644 --- a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H @@ -11,7 +11,7 @@ SLGThermo slgThermo(mesh, thermo); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index 7f62f6229c..6b34aacab8 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -10,7 +10,7 @@ SLGThermo slgThermo(mesh, thermo); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -const word inertSpecie(thermo.lookup("inertSpecie")); +const word inertSpecie(thermo.get("inertSpecie")); if (!composition.species().found(inertSpecie)) { FatalIOErrorIn(args.executable().c_str(), thermo) diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C index b21c4b7b51..bb241d417b 100644 --- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C +++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C @@ -37,7 +37,7 @@ Foam::autoPtr Foam::mixtureViscosityModel::New const surfaceScalarField& phi ) { - const word modelType(viscosityProperties.lookup("transportModel")); + const word modelType(viscosityProperties.get("transportModel")); Info<< "Selecting incompressible transport model " << modelType << endl; diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C index 26019f439e..93bdf484d6 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C @@ -104,7 +104,7 @@ Foam::autoPtr Foam::relativeVelocityModel::New const incompressibleTwoPhaseInteractingMixture& mixture ) { - const word modelType(dict.lookup(typeName)); + const word modelType(dict.get(typeName)); Info<< "Selecting relative velocity model " << modelType << endl; diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C index 7f0ab68963..c0e8c13c8c 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C @@ -38,7 +38,7 @@ Foam::interfaceCompositionModel::New { word interfaceCompositionModelType ( - word(dict.lookup("type")) + dict.get("type") + "<" + pair.phase1().thermo().type() + "," diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C index f40de72dd1..6262976365 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::porousModel::New const fvMesh& mesh ) { - word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting porousModel for " << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C index a880366436..653f0baae6 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C @@ -34,12 +34,12 @@ Foam::autoPtr Foam::surfaceTensionModel::New const phasePair& pair ) { - word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting surfaceTensionModel for " << pair << ": " << modelType << endl; - const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType); + const auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType); if (!cstrIter.found()) { diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModelNew.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModelNew.C index baca596119..34aa5e2e41 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModelNew.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModelNew.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::phaseModel::New const word& phaseName ) { - word modelType(fluid.subDict(phaseName).lookup("type")); + const word modelType(fluid.subDict(phaseName).get("type")); Info<< "Selecting phaseModel for " << phaseName << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystemNew.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystemNew.C index f44d34b766..05367b6fec 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystemNew.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystemNew.C @@ -45,7 +45,7 @@ Foam::autoPtr Foam::multiphaseSystem::New IOobject::NO_WRITE, false ) - ).lookup("type") + ).get("type") ); Info<< "Selecting multiphaseSystem " << multiphaseSystemType << endl; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index 36765ebc3c..d796e88266 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::dragModel::New const phaseModel& phase2 ) { - const word modelType(interfaceDict.lookup("type")); + const word modelType(interfaceDict.get("type")); Info << "Selecting dragModel for phase " << phase1.name() diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C index fc4000975d..e67eae7242 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::diameterModel::New const phaseModel& phase ) { - const word modelType(dict.lookup("diameterModel")); + const word modelType(dict.get("diameterModel")); Info << "Selecting diameterModel for phase " << phase.name() diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C index 9b55bb0358..6056071e8a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C @@ -38,7 +38,7 @@ Foam::interfaceCompositionModel::New { const word modelType ( - word(dict.lookup("type")) + dict.get("type") + "<" + pair.phase1().thermo().type() + "," diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C index 8ae0f6f552..071e44b51d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::massTransferModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting massTransferModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C index fb59ed2574..034167237b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C @@ -32,7 +32,7 @@ Foam::autoPtr Foam::saturationModel::New const dictionary& dict ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting saturationModel: " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C index 57be04722d..5685ce1970 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C @@ -35,7 +35,7 @@ Foam::surfaceTensionModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting surfaceTensionModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C index 5b44995b4e..ccfe7fc418 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C @@ -35,7 +35,7 @@ Foam::aspectRatioModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting aspectRatioModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index de8bc17cda..a5e883a4de 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::dragModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting dragModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index 71654baea6..189d8c8270 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::heatTransferModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting heatTransferModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C index a0fd721dfb..36904a763e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::liftModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting liftModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C index a3f312de8f..dc9eb410e9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C @@ -35,7 +35,7 @@ Foam::swarmCorrection::New const phasePair& pair ) { - const word correctionType(dict.lookup("type")); + const word correctionType(dict.get("type")); Info<< "Selecting swarmCorrection for " << pair << ": " << correctionType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C index 123bad7691..ed5b2fb12a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C @@ -35,7 +35,7 @@ Foam::turbulentDispersionModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting turbulentDispersionModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C index 6884a6b3be..07173dd3aa 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::virtualMassModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting virtualMassModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C index bb59931dc1..46efd8e971 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::wallDampingModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting wallDampingModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C index 2cfddbd92c..352f315bdc 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::wallLubricationModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting wallLubricationModel for " << pair << ": " << modelType << endl; 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 8324dc52bc..da29495b8f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::blendingMethod::New const wordList& phaseNames ) { - const word methodType(dict.lookup("type")); + const word methodType(dict.get("type")); Info<< "Selecting " << dict.dictName() << " blending method: " << methodType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C index fc4000975d..e67eae7242 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::diameterModel::New const phaseModel& phase ) { - const word modelType(dict.lookup("diameterModel")); + const word modelType(dict.get("diameterModel")); Info << "Selecting diameterModel for phase " << phase.name() diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C index d78fdbba5a..9c0aa58fc4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C @@ -35,7 +35,7 @@ Foam::autoPtr Foam::phaseModel::New const label index ) { - const word modelType(fluid.subDict(phaseName).lookup("type")); + const word modelType(fluid.subDict(phaseName).get("type")); Info<< "Selecting phaseModel for " << phaseName << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C index ae09589634..1b0a9f2bd3 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C @@ -45,7 +45,7 @@ Foam::autoPtr Foam::multiphaseSystem::New IOobject::NO_WRITE, false ) - ).lookup("type") + ).get("type") ); Info<< "Selecting multiphaseSystem " << systemType << endl; 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 94bbba3212..745f603956 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 @@ -33,7 +33,7 @@ Foam::wallBoilingModels::departureDiameterModel::New const dictionary& dict ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting departureDiameterModel: " << modelType << endl; 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 136224813a..64049c86ec 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 @@ -33,7 +33,7 @@ Foam::wallBoilingModels::departureFrequencyModel::New const dictionary& dict ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting departureFrequencyModel: " << modelType << endl; 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 6338ab6669..fd4e66b331 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 @@ -33,7 +33,7 @@ Foam::wallBoilingModels::nucleationSiteModel::New const dictionary& dict ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting nucleationSiteModel: " << modelType << endl; 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 ddc57a3e65..73a1ae7430 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 @@ -33,7 +33,7 @@ Foam::wallBoilingModels::partitioningModel::New const dictionary& dict ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting partitioningModel: " << modelType << endl; 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 e4a3a64634..4ccd8245ed 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 @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::conductivityModel::New const dictionary& dict ) { - const word modelType(dict.lookup("conductivityModel")); + const word modelType(dict.get("conductivityModel")); Info<< "Selecting conductivityModel " << modelType << 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 608cd1178d..95addd080c 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 @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New const dictionary& dict ) { - const word modelType(dict.lookup("frictionalStressModel")); + const word modelType(dict.get("frictionalStressModel")); Info<< "Selecting frictionalStressModel " << modelType << 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 1810e248bf..20cc4357eb 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 @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::granularPressureModel::New const dictionary& dict ) { - const word modelType(dict.lookup("granularPressureModel")); + const word modelType(dict.get("granularPressureModel")); Info<< "Selecting granularPressureModel " << modelType << 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 0ac0a36afe..3e1ff3bb8e 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 @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::radialModel::New const dictionary& dict ) { - const word modelType(dict.lookup("radialModel")); + const word modelType(dict.get("radialModel")); Info<< "Selecting radialModel " << modelType << 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 0120b2a1b4..52c4691eca 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 @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::viscosityModel::New const dictionary& dict ) { - const word modelType(dict.lookup("viscosityModel")); + const word modelType(dict.get("viscosityModel")); Info<< "Selecting viscosityModel " << modelType << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C index 50a2f015a7..9a9485ea0a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C @@ -45,7 +45,7 @@ Foam::autoPtr Foam::twoPhaseSystem::New IOobject::NO_WRITE, false ) - ).lookup("type") + ).get("type") ); Info<< "Selecting twoPhaseSystem " << systemType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C index 5b44995b4e..ccfe7fc418 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C @@ -35,7 +35,7 @@ Foam::aspectRatioModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting aspectRatioModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index de8bc17cda..a5e883a4de 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::dragModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting dragModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index 71654baea6..189d8c8270 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::heatTransferModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting heatTransferModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C index a0fd721dfb..36904a763e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::liftModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting liftModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C index 5462b768a2..b94a6f05f7 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C @@ -35,7 +35,7 @@ Foam::swarmCorrection::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting swarmCorrection for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C index 123bad7691..ed5b2fb12a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C @@ -35,7 +35,7 @@ Foam::turbulentDispersionModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting turbulentDispersionModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C index 6884a6b3be..07173dd3aa 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::virtualMassModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting virtualMassModel for " << pair << ": " << modelType << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C index 2cfddbd92c..352f315bdc 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::wallLubricationModel::New const phasePair& pair ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting wallLubricationModel for " << pair << ": " << modelType << endl; 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 e4a3a64634..4ccd8245ed 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::conductivityModel::New const dictionary& dict ) { - const word modelType(dict.lookup("conductivityModel")); + const word modelType(dict.get("conductivityModel")); Info<< "Selecting conductivityModel " << modelType << 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 255b15593a..95512d3e2d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New const dictionary& dict ) { - const word modelType(dict.lookup("frictionalStressModel")); + const word modelType(dict.get("frictionalStressModel")); Info<< "Selecting frictionalStressModel " << modelType << 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 7898a94cca..38e9d62028 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::granularPressureModel::New const dictionary& dict ) { - const word modelType(dict.lookup("granularPressureModel")); + const word modelType(dict.get("granularPressureModel")); Info<< "Selecting granularPressureModel " << modelType << 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 0ac0a36afe..3e1ff3bb8e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::radialModel::New const dictionary& dict ) { - const word modelType(dict.lookup("radialModel")); + const word modelType(dict.get("radialModel")); Info<< "Selecting radialModel " << modelType << 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 83067ea6ee..ee18622217 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C @@ -33,7 +33,7 @@ Foam::kineticTheoryModels::viscosityModel::New const dictionary& dict ) { - const word modelName(dict.lookup("viscosityModel")); + const word modelName(dict.get("viscosityModel")); Info<< "Selecting viscosityModel " << modelName << 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 f4419b735e..d16bec3691 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::blendingMethod::New const wordList& phaseNames ) { - const word methodName(dict.lookup("type")); + const word methodName(dict.get("type")); Info<< "Selecting " << dict.dictName() << " blending method: " << methodName << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C index fc4000975d..e67eae7242 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::diameterModel::New const phaseModel& phase ) { - const word modelType(dict.lookup("diameterModel")); + const word modelType(dict.get("diameterModel")); Info << "Selecting diameterModel for phase " << phase.name() diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index 05f9eaedac..4775743f10 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C @@ -661,8 +661,8 @@ int main(int argc, char *argv[]) const word& key = iter().keyword(); const dictionary& dict = iter().dict(); - const word cyclicName = dict.lookup("cyclicMasterPatch"); - const word wallName = dict.lookup("wallPatch"); + const word cyclicName = dict.get("cyclicMasterPatch"); + const word wallName = dict.get("wallPatch"); FixedList nameAndType; nameAndType[0] = key; nameAndType[1] = wallName; @@ -685,12 +685,12 @@ int main(int argc, char *argv[]) } // All exposed faces that are not explicitly marked to be put into a patch - const word defaultPatch(dict.lookup("defaultPatch")); + const word defaultPatch(dict.get("defaultPatch")); Info<< "Faces that get exposed become boundary faces in patch " << defaultPatch << endl; - const word blockedSetName(dict.lookup("blockedCells")); + const word blockedSetName(dict.get("blockedCells")); Info<< "Reading blocked cells from cellSet " << blockedSetName << endl; @@ -1276,7 +1276,7 @@ int main(int argc, char *argv[]) << " so might have to be moved back to constant/" << nl << endl; - word startFrom(runTime.controlDict().lookup("startFrom")); + const word startFrom(runTime.controlDict().get("startFrom")); if (startFrom != "latestTime") { diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C index 3b6d9130b8..61e4226fb8 100644 --- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C +++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C @@ -138,13 +138,22 @@ void Foam::helpType::displayDoc if (parser.found(className)) { - fileName docFile(doxyPath/parser.subDict(className).lookup("filename")); + fileName docFile + ( + doxyPath/parser.subDict(className).get("filename") + ); // can use FOAM_DOC_BROWSER='application file://%f' if required docBrowser.replaceAll("%f", docFile); - fileName classDirectory(parser.subDict(className).lookup("path")); - word classFile(parser.subDict(className).lookup("name")); + fileName classDirectory + ( + parser.subDict(className).get("path") + ); + const word classFile + ( + parser.subDict(className).get("name") + ); Info<< "Showing documentation for type " << className << nl << endl; diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index 89b3e0296c..418492911c 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -342,7 +342,7 @@ void determineDecomposition scalarField cellWeights; if (method.found("weightField")) { - word weightName = method.lookup("weightField"); + word weightName = method.get("weightField"); volScalarField weights ( diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H index 67699d3c0a..c8d497a084 100644 --- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H +++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H @@ -4,6 +4,6 @@ const word dictName("particleTrackDict"); IOdictionary propsDict(dictIO); -word cloudName(propsDict.lookup("cloud")); +word cloudName(propsDict.get("cloud")); List userFields(propsDict.lookup("fields")); diff --git a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C index f17ebb902e..40c72fc2ab 100644 --- a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C +++ b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C @@ -257,7 +257,7 @@ int main(int argc, char *argv[]) entry::disableFunctionEntries = 1; // Read the solver - const word& solverName = controlDict.lookup("application"); + const word solverName(controlDict.get("application")); // Generate solver template const solverTemplate solver(baseDir, runTime, solverName); diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C index 2f6cfa09fc..ee0e32169e 100644 --- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C +++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C @@ -34,7 +34,7 @@ Foam::tabulatedWallFunctions::tabulatedWallFunction::New const polyMesh& mesh ) { - const word functionName = dict.lookup("tabulatedWallFunction"); + const word functionName(dict.get("tabulatedWallFunction")); Info<< "Selecting tabulatedWallFunction " << functionName << endl; diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C index 2108e73a9d..42f9639cef 100644 --- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C +++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C @@ -68,7 +68,7 @@ Foam::surfaceFeaturesExtraction::method::New const dictionary& dict ) { - const word methodName = dict.lookup("extractionMethod"); + const word methodName(dict.get("extractionMethod")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodName); diff --git a/applications/utilities/surface/surfacePatch/surfacePatch.C b/applications/utilities/surface/surfacePatch/surfacePatch.C index 4d9ed0247f..ab58b505ca 100644 --- a/applications/utilities/surface/surfacePatch/surfacePatch.C +++ b/applications/utilities/surface/surfacePatch/surfacePatch.C @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) ( searchableSurfaceModifier::New ( - surfDict.lookup("type"), + surfDict.get("type"), allGeometry, surfDict ) @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) ( searchableSurfaceModifier::New ( - regionDict.lookup("type"), + regionDict.get("type"), allGeometry, regionDict ) diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C index 577ea7c597..207deda377 100644 --- a/src/OpenFOAM/dimensionSet/dimensionSets.C +++ b/src/OpenFOAM/dimensionSet/dimensionSets.C @@ -107,7 +107,7 @@ const HashTable& unitSet() << exit(FatalIOError); } - const word unitSetCoeffs(word(dict.lookup("unitSet")) + "Coeffs"); + const word unitSetCoeffs(dict.get("unitSet") + "Coeffs"); if (!dict.found(unitSetCoeffs)) { diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C index 5e88a183dc..4ab75d2ab0 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C @@ -114,7 +114,7 @@ Foam::autoPtr> Foam::pointPatchField::New InfoInFunction << "Constructing pointPatchField" << endl; } - word patchFieldType(dict.lookup("type")); + const word patchFieldType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(patchFieldType); @@ -144,7 +144,7 @@ Foam::autoPtr> Foam::pointPatchField::New if ( !dict.found("patchType") - || word(dict.lookup("patchType")) != p.type() + || dict.get("patchType") != p.type() ) { if (pfPtr().constraintType() == p.constraintType()) diff --git a/src/OpenFOAM/global/constants/dimensionedConstants.H b/src/OpenFOAM/global/constants/dimensionedConstants.H index 3863e64590..53535b30b8 100644 --- a/src/OpenFOAM/global/constants/dimensionedConstants.H +++ b/src/OpenFOAM/global/constants/dimensionedConstants.H @@ -65,7 +65,7 @@ T dimensionedConstant { dictionary& dict = dimensionedConstants(); - const word unitSet(dict.lookup("unitSet")); + const word unitSet(dict.get("unitSet")); dictionary& unitDict(dict.subDict(unitSet + "Coeffs")); diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C index a0f4b9241f..d35db37028 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C @@ -35,7 +35,10 @@ Foam::LduMatrix::preconditioner::New const dictionary& preconditionerDict ) { - const word preconditionerName = preconditionerDict.lookup("preconditioner"); + const word preconditionerName + ( + preconditionerDict.get("preconditioner") + ); if (sol.matrix().symmetric()) { diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C index a362e5f160..d4993d050d 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C @@ -36,7 +36,7 @@ Foam::LduMatrix::smoother::New const dictionary& smootherDict ) { - word smootherName = smootherDict.lookup("smoother"); + const word smootherName(smootherDict.get("smoother")); if (matrix.symmetric()) { diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C index 5324acef62..aa7c37a3cc 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C @@ -37,7 +37,7 @@ Foam::LduMatrix::solver::New const dictionary& solverDict ) { - const word solverName = solverDict.lookup("solver"); + const word solverName(solverDict.get("solver")); if (matrix.diagonal()) { diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C index 8629b76654..f5e0c61c67 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C @@ -47,7 +47,7 @@ Foam::autoPtr Foam::lduMatrix::solver::New const dictionary& solverControls ) { - const word name(solverControls.lookup("solver")); + const word name(solverControls.get("solver")); if (matrix.diagonal()) { diff --git a/src/OpenFOAM/matrices/tolerances/tolerances.C b/src/OpenFOAM/matrices/tolerances/tolerances.C index 76e4440a13..2655bf7b63 100644 --- a/src/OpenFOAM/matrices/tolerances/tolerances.C +++ b/src/OpenFOAM/matrices/tolerances/tolerances.C @@ -57,7 +57,7 @@ bool Foam::tolerances::read() { if (regIOobject::read()) { - const word toleranceSetName(lookup("toleranceSet")); + const word toleranceSetName(get("toleranceSet")); const dictionary& toleranceSet(subDict(toleranceSetName)); if (toleranceSet.found("relaxationFactors")) @@ -78,10 +78,8 @@ bool Foam::tolerances::read() return true; } - else - { - return false; - } + + return false; } diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C index 6421a4ee53..f63eba0496 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C @@ -63,7 +63,7 @@ Foam::genericPolyPatch::genericPolyPatch ) : polyPatch(name, dict, index, bm, patchType), - actualTypeName_(dict.lookup("type")), + actualTypeName_(dict.get("type")), dict_(dict) {} diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C index f8289222d8..a02b5fdd95 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C @@ -83,7 +83,7 @@ Foam::autoPtr Foam::polyPatch::New InfoInFunction << "Constructing polyPatch" << endl; } - word patchType(dict.lookup("type")); + word patchType(dict.get("type")); dict.readIfPresent("geometricType", patchType); return polyPatch::New(patchType, name, dict, index, bm); diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C index ae9efcb289..2557cae94f 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::cellZone::New InfoInFunction << "Constructing cellZone " << name << endl; } - const word zoneType(dict.lookup("type")); + const word zoneType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(zoneType); diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C index 58acaf9ce2..1d546ead91 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::faceZone::New InfoInFunction << "Constructing faceZone " << name << endl; } - const word zoneType(dict.lookup("type")); + const word zoneType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(zoneType); diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C index a27c65d5b9..544ea5de3b 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::pointZone::New InfoInFunction << "Constructing pointZone " << name << endl; } - const word zoneType(dict.lookup("type")); + const word zoneType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(zoneType); diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C index 9063d21f83..24adbadf99 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C +++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C @@ -38,7 +38,7 @@ Foam::autoPtr> Foam::Function1::New { const dictionary& coeffsDict(dict.subDict(entryName)); - const word Function1Type(coeffsDict.lookup("type")); + const word Function1Type(coeffsDict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(Function1Type); @@ -57,7 +57,7 @@ Foam::autoPtr> Foam::Function1::New } else { - Istream& is = dict.lookup(entryName); // non-recursive, allow patterns + Istream& is = dict.lookup(entryName, keyType::REGEX); token firstToken(is); word Function1Type; diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C index de82407e46..ed69d7e5c3 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C @@ -70,7 +70,7 @@ Foam::autoPtr Foam::LESdelta::New const word& lookupName ) { - const word deltaType(dict.lookup(lookupName)); + const word deltaType(dict.get(lookupName)); Info<< "Selecting LES " << lookupName << " type " << deltaType << endl; @@ -99,7 +99,7 @@ Foam::autoPtr Foam::LESdelta::New const word& lookupName ) { - const word deltaType(dict.lookup(lookupName)); + const word deltaType(dict.get(lookupName)); Info<< "Selecting LES " << lookupName << " type " << deltaType << endl; diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C index ae7017eb91..fc665f11f6 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::LESfilter::New const word& filterDictName ) { - const word filterType(dict.lookup(filterDictName)); + const word filterType(dict.get(filterDictName)); auto cstrIter = dictionaryConstructorTablePtr_->cfind(filterType); diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C index 2223fea335..d4867e22d7 100644 --- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C +++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C @@ -63,7 +63,7 @@ Foam::porosityModels::powerLawLopesdaCostaZone::powerLawLopesdaCostaZone scalar searchSpan(coeffs.get("searchSpan")); // Top surface file name defining the extent of the porous region - word topSurfaceFileName(coeffs.lookup("topSurface")); + const word topSurfaceFileName(coeffs.get("topSurface")); // List of the ground patches defining the lower surface // of the porous region diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C index 3de74d946b..bbd2779dd1 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C @@ -51,7 +51,7 @@ Foam::autoPtr Foam::dynamicFvMesh::New(const IOobject& io) { IOdictionary dict(dictHeader); - const word modelType(dict.lookup("dynamicFvMesh")); + const word modelType(dict.get("dynamicFvMesh")); Info<< "Selecting dynamicFvMesh " << modelType << endl; diff --git a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C index 2f93ca2fb2..7e720fd38a 100644 --- a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C +++ b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C @@ -77,7 +77,7 @@ Foam::dynamicMultiMotionSolverFvMesh::dynamicMultiMotionSolverFvMesh { const dictionary& subDict = iter().dict(); - word zoneName(subDict.lookup("cellZone")); + const word zoneName(subDict.get("cellZone")); zoneIDs_[zoneI] = cellZones().findZoneID(zoneName); diff --git a/src/dynamicFvMesh/simplifiedDynamicFvMesh/simplifiedDynamicFvMesh.C b/src/dynamicFvMesh/simplifiedDynamicFvMesh/simplifiedDynamicFvMesh.C index 9ecc46af0e..31a0ea8ab4 100644 --- a/src/dynamicFvMesh/simplifiedDynamicFvMesh/simplifiedDynamicFvMesh.C +++ b/src/dynamicFvMesh/simplifiedDynamicFvMesh/simplifiedDynamicFvMesh.C @@ -60,7 +60,7 @@ Foam::simplifiedMeshes::simplifiedDynamicFvMeshBase::New { IOdictionary dict(dictHeader); - const word modelType(dict.lookup("dynamicFvMesh")); + const word modelType(dict.get("dynamicFvMesh")); auto cstrIter = timeConstructorTablePtr_->cfind(modelType); diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.C b/src/dynamicMesh/fvMeshTools/fvMeshTools.C index 28e6f2b355..b45e84eda4 100644 --- a/src/dynamicMesh/fvMeshTools/fvMeshTools.C +++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.C @@ -568,7 +568,7 @@ Foam::autoPtr Foam::fvMeshTools::newMesh forAll(patchEntries, patchI) { const entry& e = patchEntries[patchI]; - const word type(e.dict().lookup("type")); + const word type(e.dict().get("type")); if ( diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C index 6846e30c4e..8aba5620d8 100644 --- a/src/dynamicMesh/meshCut/directions/directions.C +++ b/src/dynamicMesh/meshCut/directions/directions.C @@ -340,7 +340,7 @@ Foam::directions::directions { const dictionary& patchDict = dict.subDict("patchLocalCoeffs"); - const word patchName(patchDict.lookup("patch")); + const word patchName(patchDict.get("patch")); const label patchi = mesh.boundaryMesh().findPatchID(patchName); diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C index cfff04f05f..d45f091c67 100644 --- a/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C +++ b/src/dynamicMesh/motionSolvers/displacement/displacement/displacementMotionSolver.C @@ -89,7 +89,7 @@ Foam::displacementMotionSolver::New const pointIOField& points0 ) { - //const word solverTypeName(solverDict.lookup("solver")); + //const word solverTypeName(solverDict.get("solver")); Info<< "Selecting motion solver: " << solverTypeName << endl; diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C index 8a6d6a6ec0..4fc9265323 100644 --- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C +++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C @@ -230,7 +230,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate tmp tfld(new vectorField(meshPoints.size())); vectorField& fld = tfld.ref(); - const word type(dict.lookup("type")); + const word type(dict.get("type")); if (type == "fixedValue") { @@ -262,7 +262,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate { // Reads name of name of patch. Then get average point displacement on // patch. That becomes the value of fld. - const word patchName(dict.lookup("patch")); + const word patchName(dict.get("patch")); label patchID = mesh().boundaryMesh().findPatchID(patchName); pointField pdf ( @@ -451,7 +451,7 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve } - const word interpolationScheme = zoneDict.lookup("interpolationScheme"); + const word interpolationScheme(zoneDict.get("interpolationScheme")); if (interpolationScheme == "oneSided") { diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C index e57fc35ee5..ec1ed4fb6f 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C @@ -46,7 +46,7 @@ Foam::solidBodyMotionFunction::solidBodyMotionFunction ( SBMFCoeffs.optionalSubDict ( - word(SBMFCoeffs.lookup("solidBodyMotionFunction")) + "Coeffs" + SBMFCoeffs.get("solidBodyMotionFunction") + "Coeffs" ) ), time_(runTime) diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C index 3ff7098ca0..82fb5c732e 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunctionNew.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::solidBodyMotionFunction::New const Time& runTime ) { - const word motionType(SBMFCoeffs.lookup("solidBodyMotionFunction")); + const word motionType(SBMFCoeffs.get("solidBodyMotionFunction")); Info<< "Selecting solid-body motion function " << motionType << endl; diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C index 2569a86ce4..28ef8f9029 100644 --- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C +++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C @@ -41,7 +41,7 @@ Foam::autoPtr Foam::polyMeshModifier::New InfoInFunction << "Constructing polyMeshModifier" << endl; } - const word modifierType(dict.lookup("type")); + const word modifierType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(modifierType); diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C index 156f95bafe..fb90fe17f6 100644 --- a/src/finiteArea/faMesh/faMesh.C +++ b/src/finiteArea/faMesh/faMesh.C @@ -408,13 +408,13 @@ Foam::faMesh::faMesh faPatches[patchI].name_ = faPatchNames[patchI]; - faPatches[patchI].type_ = word(curPatchDict.lookup("type")); + faPatches[patchI].type_ = curPatchDict.get("type"); faPatches[patchI].ownPolyPatchID_ = - pbm.findPatchID(word(curPatchDict.lookup("ownerPolyPatch"))); + pbm.findPatchID(curPatchDict.get("ownerPolyPatch")); faPatches[patchI].ngbPolyPatchID_ = - pbm.findPatchID(word(curPatchDict.lookup("neighbourPolyPatch"))); + pbm.findPatchID(curPatchDict.get("neighbourPolyPatch")); } diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldNew.C b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldNew.C index 87cde332c3..5189bb8073 100644 --- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldNew.C +++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldNew.C @@ -75,7 +75,7 @@ Foam::tmp> Foam::faPatchField::New << "constructing faPatchField" << endl; - word patchFieldType(dict.lookup("type")); + const word patchFieldType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(patchFieldType); diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldNew.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldNew.C index 5cf2f24240..7d021a03cb 100644 --- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldNew.C +++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldNew.C @@ -75,7 +75,7 @@ Foam::tmp> Foam::faePatchField::New << "constructing faePatchField" << endl; - word patchFieldType(dict.lookup("type")); + const word patchFieldType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(patchFieldType); diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C index 195d41a684..26d7cf2ec2 100644 --- a/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C +++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOption.C @@ -70,7 +70,7 @@ Foam::autoPtr Foam::fv::option::New const fvMesh& mesh ) { - const word modelType(coeffs.lookup("type")); + const word modelType(coeffs.get("type")); Info<< indent << "Selecting finite volume options type " << modelType << endl; diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C index 866c8a48a5..2c94a44ea9 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C @@ -105,7 +105,7 @@ Foam::tmp> Foam::fvPatchField::New const dictionary& dict ) { - const word patchFieldType(dict.lookup("type")); + const word patchFieldType(dict.get("type")); if (debug) { @@ -138,8 +138,8 @@ Foam::tmp> Foam::fvPatchField::New if ( - !dict.found("patchType") - || word(dict.lookup("patchType")) != p.type() + !dict.found("patchType") + || dict.get("patchType") != p.type() ) { auto patchTypeCstrIter diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C index 5bcd17570e..4ef1047a94 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C @@ -100,7 +100,7 @@ Foam::tmp> Foam::fvsPatchField::New InfoInFunction << "Constructing fvsPatchField" << endl; } - const word patchFieldType(dict.lookup("type")); + const word patchFieldType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(patchFieldType); @@ -127,7 +127,7 @@ Foam::tmp> Foam::fvsPatchField::New if ( !dict.found("patchType") - || word(dict.lookup("patchType")) != p.type() + || dict.get("patchType") != p.type() ) { auto patchTypeCstrIter diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C index e7357ff4d4..37caf55265 100644 --- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C +++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C @@ -56,7 +56,7 @@ Foam::autoPtr Foam::patchDistMethod::New const labelHashSet& patchIDs ) { - const word methodType(dict.lookup("method")); + const word methodType(dict.get("method")); Info<< "Selecting patchDistMethod " << methodType << endl; diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C index 805e5c0e52..229cea679e 100644 --- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C +++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C @@ -54,7 +54,7 @@ Foam::genericFaPatchField::genericFaPatchField ) : calculatedFaPatchField(p, iF, dict), - actualTypeName_(dict.lookup("type")), + actualTypeName_(dict.get("type")), dict_(dict) { if (!dict.found("value")) diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C index 3ef8cf3b51..49b1b36e85 100644 --- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C +++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C @@ -50,7 +50,7 @@ Foam::genericPointPatchField::genericPointPatchField ) : calculatedPointPatchField(p, iF, dict), - actualTypeName_(dict.lookup("type")), + actualTypeName_(dict.get("type")), dict_(dict) { forAllConstIter(dictionary, dict_, iter) diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C index 549932dfe2..11cbdd9b15 100644 --- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C +++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C @@ -35,7 +35,7 @@ Foam::BinaryCollisionModel::New CloudType& owner ) { - const word modelType(dict.lookup("BinaryCollisionModel")); + const word modelType(dict.get("BinaryCollisionModel")); Info<< "Selecting BinaryCollisionModel " << modelType << endl; diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C index 70f9d09e80..345f3183ee 100644 --- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C +++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C @@ -35,7 +35,7 @@ Foam::InflowBoundaryModel::New CloudType& owner ) { - const word modelType(dict.lookup("InflowBoundaryModel")); + const word modelType(dict.get("InflowBoundaryModel")); Info<< "Selecting InflowBoundaryModel " << modelType << endl; diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C index 6254511609..ac29528bb8 100644 --- a/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C +++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C @@ -35,7 +35,7 @@ Foam::WallInteractionModel::New CloudType& owner ) { - const word modelType(dict.lookup("WallInteractionModel")); + const word modelType(dict.get("WallInteractionModel")); Info<< "Selecting WallInteractionModel " << modelType << endl; diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C index aa596e6898..1dfcaf3d04 100644 --- a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C +++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::distributionModel::New Random& rndGen ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting distribution model " << modelType << endl; diff --git a/src/lagrangian/intermediate/integrationScheme/integrationScheme/integrationSchemeNew.C b/src/lagrangian/intermediate/integrationScheme/integrationScheme/integrationSchemeNew.C index 5659ca92cf..f22e6cbc3b 100644 --- a/src/lagrangian/intermediate/integrationScheme/integrationScheme/integrationSchemeNew.C +++ b/src/lagrangian/intermediate/integrationScheme/integrationScheme/integrationSchemeNew.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::integrationScheme::New const dictionary& dict ) { - const word schemeName(dict.lookup(phiName)); + const word schemeName(dict.get(phiName)); Info<< "Selecting " << phiName << " integration scheme " << schemeName << endl; diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C index 5fe2a1b512..cf2386b6e1 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C @@ -68,9 +68,6 @@ Foam::CloudFunctionObjectList::CloudFunctionObjectList const dictionary& modelDict(dict.subDict(modelName)); - // read the type of the function object - const word objectType(modelDict.lookup("type")); - this->set ( i, @@ -78,7 +75,7 @@ Foam::CloudFunctionObjectList::CloudFunctionObjectList ( modelDict, owner, - objectType, + modelDict.get("type"), modelName ) ); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C index 5c8b778c91..65939cecda 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelNew.C @@ -35,7 +35,7 @@ Foam::CollisionModel::New CloudType& owner ) { - const word modelType(dict.lookup("collisionModel")); + const word modelType(dict.get("collisionModel")); Info<< "Selecting collision model " << modelType << endl; 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 6f8a2d1b42..c2b9e5d310 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 @@ -35,7 +35,7 @@ Foam::PairModel::New CloudType& owner ) { - const word modelType(dict.lookup("pairModel")); + const word modelType(dict.get("pairModel")); Info<< "Selecting pair model " << modelType << endl; 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 936163a3fe..596116a760 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 @@ -35,7 +35,7 @@ Foam::WallModel::New CloudType& owner ) { - const word modelType(dict.lookup("wallModel")); + const word modelType(dict.get("wallModel")); Info<< "Selecting wall model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C index 990da5b40f..0ca61051c6 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C @@ -35,7 +35,7 @@ Foam::DispersionModel::New CloudType& owner ) { - const word modelType(dict.lookup("dispersionModel")); + const word modelType(dict.get("dispersionModel")); Info<< "Selecting dispersion model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index 00ebd9280e..69557800d4 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -340,7 +340,7 @@ Foam::InjectionModel::InjectionModel SOI_ = owner.db().time().userTimeToTime(SOI_); - const word parcelBasisType = this->coeffDict().lookup("parcelBasisType"); + const word parcelBasisType(this->coeffDict().getWord("parcelBasisType")); if (parcelBasisType == "mass") { diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.C index 6da3769116..69d5218273 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelList.C @@ -65,7 +65,7 @@ Foam::InjectionModelList::InjectionModelList ( props, model, - props.lookup("type"), + props.get("type"), owner ) ); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C index 3fde72fdd1..fa04629f96 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C @@ -35,7 +35,7 @@ Foam::InjectionModel::New CloudType& owner ) { - const word modelType(dict.lookup("injectionModel")); + const word modelType(dict.get("injectionModel")); Info<< "Selecting injection model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C index 381fe58e29..4f568925c1 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C @@ -35,7 +35,7 @@ Foam::PatchInteractionModel::New CloudType& owner ) { - const word modelType(dict.lookup("patchInteractionModel")); + const word modelType(dict.get("patchInteractionModel")); Info<< "Selecting patch interaction model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C index 03728eaee6..e8d9ceb220 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C @@ -38,7 +38,7 @@ Foam::StandardWallInteraction::StandardWallInteraction mesh_(cloud.mesh()), interactionType_ ( - this->wordToInteractionType(this->coeffDict().lookup("type")) + this->wordToInteractionType(this->coeffDict().getWord("type")) ), e_(0.0), mu_(0.0), @@ -55,7 +55,7 @@ Foam::StandardWallInteraction::StandardWallInteraction { case PatchInteractionModel::itOther: { - const word interactionTypeName(this->coeffDict().lookup("type")); + const word interactionTypeName(this->coeffDict().getWord("type")); FatalErrorInFunction << "Unknown interaction result type " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C index c35eece969..dd091241f6 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C @@ -35,7 +35,7 @@ Foam::StochasticCollisionModel::New CloudType& owner ) { - const word modelType(dict.lookup("stochasticCollisionModel")); + const word modelType(dict.get("stochasticCollisionModel")); Info<< "Selecting stochastic collision model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C index 07331049c7..52416e0e66 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C @@ -35,7 +35,7 @@ Foam::SurfaceFilmModel::New CloudType& owner ) { - const word modelType(dict.lookup("surfaceFilmModel")); + const word modelType(dict.get("surfaceFilmModel")); Info<< "Selecting surface film model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C index 7f45192a44..a0833769ce 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C @@ -84,7 +84,7 @@ Foam::AveragingMethod::New const fvMesh& mesh ) { - const word averageType(dict.lookup(typeName)); + const word averageType(dict.get(typeName)); //Info<< "Selecting averaging method " // << averageType << endl; diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C index 5298d93b1a..e1fde7f8fb 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C @@ -56,7 +56,7 @@ Foam::CorrectionLimitingMethod::New const dictionary& dict ) { - word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting correction limiter " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C index fd2a6cb375..4698cf8eb5 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C @@ -80,7 +80,7 @@ Foam::DampingModel::New CloudType& owner ) { - word modelType(dict.lookup(typeName)); + const word modelType(dict.get(typeName)); Info<< "Selecting damping model " << modelType << endl; @@ -96,11 +96,7 @@ Foam::DampingModel::New << exit(FatalError); } - return - autoPtr> - ( - cstrIter()(dict, owner) - ); + return autoPtr>(cstrIter()(dict, owner)); } diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C index d929247b2e..f3e0144962 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "IsotropyModel.H" - #include "TimeScaleModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -84,7 +83,7 @@ Foam::IsotropyModel::New CloudType& owner ) { - word modelType(dict.lookup(typeName)); + const word modelType(dict.get(typeName)); Info<< "Selecting isotropy model " << modelType << endl; @@ -100,11 +99,7 @@ Foam::IsotropyModel::New << exit(FatalError); } - return - autoPtr> - ( - cstrIter()(dict, owner) - ); + return autoPtr>(cstrIter()(dict, owner)); } diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C index 0307220208..e3764181b0 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C @@ -82,7 +82,7 @@ Foam::PackingModel::New CloudType& owner ) { - word modelType(dict.lookup(typeName)); + const word modelType(dict.get(typeName)); Info<< "Selecting packing model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C index 8a3077760f..070f8b55d4 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C @@ -61,7 +61,7 @@ Foam::autoPtr Foam::ParticleStressModel::New const dictionary& dict ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting particle stress model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C index 79c1746f29..600447600e 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C @@ -65,7 +65,7 @@ Foam::autoPtr Foam::TimeScaleModel::New const dictionary& dict ) { - const word modelType(dict.lookup("type")); + const word modelType(dict.get("type")); Info<< "Selecting time scale model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C index 6d226d6b1e..c56c4a594f 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C @@ -35,7 +35,7 @@ Foam::CompositionModel::New CloudType& owner ) { - const word modelType(dict.lookup("compositionModel")); + const word modelType(dict.get("compositionModel")); Info<< "Selecting composition model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C index 3e8abf2397..1d5d16e05d 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C @@ -35,7 +35,7 @@ Foam::PhaseChangeModel::New CloudType& owner ) { - const word modelType(dict.lookup("phaseChangeModel")); + const word modelType(dict.get("phaseChangeModel")); Info<< "Selecting phase change model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C index 2bfb98886f..32c7a7acba 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C @@ -35,7 +35,7 @@ Foam::DevolatilisationModel::New CloudType& owner ) { - const word modelType(dict.lookup("devolatilisationModel")); + const word modelType(dict.get("devolatilisationModel")); Info<< "Selecting devolatilisation model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C index 9888a13c6f..b43dc29d6c 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C @@ -35,7 +35,7 @@ Foam::SurfaceReactionModel::New CloudType& owner ) { - const word modelType(dict.lookup("surfaceReactionModel")); + const word modelType(dict.get("surfaceReactionModel")); Info<< "Selecting surface reaction model " << modelType << endl; diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C index c0f72be44f..527afa0d9f 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C @@ -35,7 +35,7 @@ Foam::HeatTransferModel::New CloudType& owner ) { - const word modelType(dict.lookup("heatTransferModel")); + const word modelType(dict.get("heatTransferModel")); Info<< "Selecting heat transfer model " << modelType << endl; diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C index f5ddf77009..bdf3ddfc8a 100644 --- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C +++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C @@ -35,7 +35,7 @@ Foam::autoPtr Foam::energyScalingFunction::New const pairPotential& pairPot ) { - const word scalingType(propDict.lookup("energyScalingFunction")); + const word scalingType(propDict.get("energyScalingFunction")); Info<< "Selecting energy scaling function " << scalingType << " for " diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C index 22bc439d78..ec7c353a8c 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::pairPotential::New const dictionary& propDict ) { - const word potentialType(propDict.lookup("pairPotential")); + const word potentialType(propDict.get("pairPotential")); Info<< nl << "Selecting intermolecular pair potential " << potentialType << " for " diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C index 3570517f8d..760215ec3c 100644 --- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C +++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::tetherPotential::New const dictionary& propDict ) { - const word potentialType(propDict.lookup("tetherPotential")); + const word potentialType(propDict.get("tetherPotential")); Info<< nl << "Selecting tether potential " << potentialType << " for " << name << endl; diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C index 2ac000be12..d404a6e130 100644 --- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C +++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModelNew.C @@ -35,7 +35,7 @@ Foam::AtomizationModel::New CloudType& owner ) { - const word modelType(dict.lookup("atomizationModel")); + const word modelType(dict.get("atomizationModel")); Info<< "Selecting atomizationModel " << modelType << endl; diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C index 3189306a86..df637b3315 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C +++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModelNew.C @@ -35,7 +35,7 @@ Foam::BreakupModel::New CloudType& owner ) { - const word modelType(dict.lookup("breakupModel")); + const word modelType(dict.get("breakupModel")); Info<< "Selecting breakupModel " << modelType << endl; diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C index f136aa3d41..d98624677b 100644 --- a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C +++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C @@ -493,12 +493,12 @@ Foam::autoPtr Foam::blockMesh::createTopology { dict.add("type", patchTypes[patchi], false); } - else if (word(dict.lookup("type")) != patchTypes[patchi]) + else if (dict.get("type") != patchTypes[patchi]) { FatalIOErrorInFunction(meshDescription) << "For patch " << patchNames[patchi] << " overriding type '" << patchTypes[patchi] - << "' with '" << word(dict.lookup("type")) + << "' with '" << dict.get("type") << "' (read from boundary file)" << exit(FatalIOError); } diff --git a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C index a70ba047e3..b30f571a49 100644 --- a/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C +++ b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C @@ -32,7 +32,7 @@ Foam::autoPtr Foam::extrudeModel::New const dictionary& dict ) { - const word modelType(dict.lookup("extrudeModel")); + const word modelType(dict.get("extrudeModel")); Info<< "Selecting extrudeModel " << modelType << endl; diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C index 5f4d801403..52d094013f 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C @@ -69,7 +69,7 @@ Foam::displacementMeshMoverMotionSolver::meshMover() const { if (!meshMoverPtr_.valid()) { - const word moverType(coeffDict().lookup("meshMover")); + const word moverType(coeffDict().get("meshMover")); meshMoverPtr_ = externalDisplacementMeshMover::New ( diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C index 598ba950c5..1c665dc68c 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C @@ -1756,7 +1756,7 @@ bool Foam::medialAxisMeshMover::move // ~~~~~~~~~~~~~~~~~~~ //- Name of field specifying min thickness - const word minThicknessName = word(moveDict.lookup("minThicknessName")); + const word minThicknessName = moveDict.get("minThicknessName"); // Extract out patch-wise displacement diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C index 26da76af43..019579bc7e 100644 --- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C +++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C @@ -129,7 +129,7 @@ void Foam::decompositionMethod::readConstraints() { const dictionary& dict = iter().dict(); - constraintTypes.append(dict.lookup("type")); + constraintTypes.append(dict.get("type")); constraints_.append ( @@ -353,7 +353,7 @@ Foam::autoPtr Foam::decompositionMethod::New const dictionary& decompDict ) { - const word methodType(decompDict.lookup("method")); + const word methodType(decompDict.get("method")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(methodType); @@ -392,7 +392,7 @@ Foam::autoPtr Foam::decompositionMethod::New return decompositionMethod::New(decompDict); } - word methodType(decompDict.lookup("method")); + word methodType(decompDict.get("method")); regionDict.readIfPresent("method", methodType); auto cstrIter = dictionaryRegionConstructorTablePtr_->cfind(methodType); diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C index 2eb2bf5824..fe792ea53d 100644 --- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C +++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModelNew.C @@ -58,7 +58,7 @@ autoPtr pyrolysisModel::New IOobject::NO_WRITE, false ) - ).lookup("pyrolysisModel") + ).get("pyrolysisModel") ); Info<< "Selecting pyrolysisModel " << modelType << endl; @@ -87,7 +87,7 @@ autoPtr pyrolysisModel::New ) { - const word modelType = dict.lookup("pyrolysisModel"); + const word modelType(dict.get("pyrolysisModel")); Info<< "Selecting pyrolysisModel " << modelType << endl; diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C index 75d1694a71..5bd2ebccde 100644 --- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C +++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C @@ -35,7 +35,7 @@ Foam::regionModels::regionModelFunctionObject::New const word& modelName ) { - const word modelType = dict.subDict(modelName).lookup("type"); + const word modelType(dict.subDict(modelName).get("type")); Info<< " " << modelType << endl; diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C index 03ec62d02d..2e919dd372 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C @@ -42,7 +42,7 @@ autoPtr filmThermoModel::New const dictionary& dict ) { - word modelType(dict.lookup("filmThermoModel")); + word modelType(dict.get("filmThermoModel")); Info<< " Selecting filmThermoModel " << modelType << endl; diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C index 2f2e02857b..c1bf8cae17 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C @@ -42,7 +42,7 @@ autoPtr filmTurbulenceModel::New const dictionary& dict ) { - const word modelType(dict.lookup("turbulence")); + const word modelType(dict.get("turbulence")); Info<< " Selecting filmTurbulenceModel " << modelType << endl; diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C index 101af50c22..3adb13a1f6 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C @@ -57,9 +57,9 @@ patchInjection::patchInjection pbm.size() - film.regionMesh().globalData().processorPatches().size() ); - if (coeffDict_.found("patches")) + wordRes patchNames; + if (coeffDict_.readIfPresent("patches", patchNames)) { - wordReList patchNames(coeffDict_.lookup("patches")); const labelHashSet patchSet = pbm.patchSet(patchNames); Info<< " applying to patches:" << nl; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C index e68a704172..5c41e2cb17 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C @@ -42,7 +42,7 @@ autoPtr filmRadiationModel::New const dictionary& dict ) { - const word modelType(dict.lookup("radiationModel")); + const word modelType(dict.get("radiationModel")); Info<< " Selecting radiationModel " << modelType << endl; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C index 0bf3d67e1e..05da04c96b 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C @@ -43,7 +43,7 @@ autoPtr filmViscosityModel::New volScalarField& mu ) { - const word modelType(dict.lookup("filmViscosityModel")); + const word modelType(dict.get("filmViscosityModel")); Info<< " Selecting filmViscosityModel " << modelType << endl; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C index 76b1adfcb2..95fb849add 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C @@ -42,7 +42,7 @@ autoPtr heatTransferModel::New const dictionary& dict ) { - const word modelType(dict.lookup("heatTransferModel")); + const word modelType(dict.get("heatTransferModel")); Info<< " Selecting heatTransferModel " << modelType << endl; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C index 4a3de0129a..02d4e64d49 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C @@ -42,7 +42,7 @@ autoPtr phaseChangeModel::New const dictionary& dict ) { - const word modelType(dict.lookup("phaseChangeModel")); + const word modelType(dict.get("phaseChangeModel")); Info<< " Selecting phaseChangeModel " << modelType << endl; diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C index 7d96eb8e8d..236e70478f 100644 --- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C +++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C @@ -156,7 +156,7 @@ void thermalBaffleFvPatchScalarField::createPatchMesh() { const fvMesh& thisMesh = patch().boundaryMesh().mesh(); - word regionName = dict_.lookup("region"); + const word regionName(dict_.get("region")); List regionPatches(3); List patchNames(regionPatches.size()); diff --git a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C index ce5a12d6cf..49ea9a28c1 100644 --- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.C +++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::renumberMethod::New const dictionary& renumberDict ) { - const word methodType(renumberDict.lookup("method")); + const word methodType(renumberDict.get("method")); //Info<< "Selecting renumberMethod " << methodType << endl; diff --git a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C index 262f3898b3..06c8a78450 100644 --- a/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C +++ b/src/rigidBodyDynamics/bodies/rigidBody/rigidBody.C @@ -74,7 +74,7 @@ Foam::autoPtr Foam::RBD::rigidBody::New const dictionary& dict ) { - const word bodyType(dict.lookup("type")); + const word bodyType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(bodyType); diff --git a/src/rigidBodyDynamics/joints/joint/joint.C b/src/rigidBodyDynamics/joints/joint/joint.C index 6448bb6f8b..120a5f36fd 100644 --- a/src/rigidBodyDynamics/joints/joint/joint.C +++ b/src/rigidBodyDynamics/joints/joint/joint.C @@ -51,7 +51,7 @@ Foam::autoPtr Foam::RBD::joint::New const dictionary& dict ) { - const word bodyType(dict.lookup("type")); + const word bodyType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(bodyType); diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C index dd2356982a..5f88fbbfd2 100644 --- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C +++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraintNew.C @@ -35,7 +35,7 @@ Foam::RBD::restraint::New const rigidBodyModel& model ) { - const word restraintType(dict.lookup("type")); + const word restraintType(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(restraintType); diff --git a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C index 10909d79fb..dfb851333f 100644 --- a/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C +++ b/src/rigidBodyDynamics/rigidBodySolvers/rigidBodySolver/newRigidBodySolver.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::RBD::rigidBodySolver::New const dictionary& dict ) { - const word solverType(dict.lookup("type")); + const word solverType(dict.get("type")); Info<< "Selecting rigidBodySolver " << solverType << endl; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C index f19bc98f06..18e1e8bfc5 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C @@ -160,7 +160,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::read << exit(FatalError); } - axis_ = sDoFRBMRCoeffs_.lookup("axis"); + sDoFRBMRCoeffs_.readEntry("axis", axis_); scalar magAxis(mag(axis_)); @@ -177,7 +177,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::read moment_ = interpolationTable(sDoFRBMRCoeffs_); - const word angleFormat = sDoFRBMRCoeffs_.lookup("angleFormat"); + const word angleFormat(sDoFRBMRCoeffs_.get("angleFormat")); if (angleFormat == "degrees" || angleFormat == "degree") { diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C index cf5c3f38a5..33df1f5824 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C @@ -81,7 +81,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver ) : coeffDict() ), - patches_(wordRes(coeffDict().lookup("patches"))), + patches_(coeffDict().get("patches")), patchSet_(mesh.boundaryMesh().patchSet(patches_)), di_(coeffDict().get("innerDistance")), do_(coeffDict().get("outerDistance")), diff --git a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C index 706583a560..645dfbbab2 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C +++ b/src/sixDoFRigidBodyMotion/sixDoFSolvers/sixDoFSolver/newSixDoFSolver.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::sixDoFSolver::New sixDoFRigidBodyMotion& body ) { - word solverType(dict.lookup("type")); + const word solverType(dict.get("type")); Info<< "Selecting sixDoFSolver " << solverType << endl; diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C index 023986c9f2..08693c9f64 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C +++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C @@ -123,10 +123,10 @@ typename Table::iterator Foam::basicThermo::lookupThermo // Construct the name of the thermo package from the components const word thermoTypeName ( - word(thermoTypeDict.lookup("type")) + '<' - + word(thermoTypeDict.lookup("mixture")) + '<' - + word(thermoTypeDict.lookup("properties")) + ',' - + word(thermoTypeDict.lookup("energy")) + ">>" + thermoTypeDict.get("type") + '<' + + thermoTypeDict.get("mixture") + '<' + + thermoTypeDict.get("properties") + ',' + + thermoTypeDict.get("energy") + ">>" ); return lookupThermo @@ -155,13 +155,13 @@ typename Table::iterator Foam::basicThermo::lookupThermo // Construct the name of the thermo package from the components const word thermoTypeName ( - word(thermoTypeDict.lookup("type")) + '<' - + word(thermoTypeDict.lookup("mixture")) + '<' - + word(thermoTypeDict.lookup("transport")) + '<' - + word(thermoTypeDict.lookup("thermo")) + '<' - + word(thermoTypeDict.lookup("equationOfState")) + '<' - + word(thermoTypeDict.lookup("specie")) + ">>," - + word(thermoTypeDict.lookup("energy")) + ">>>" + thermoTypeDict.get("type") + '<' + + thermoTypeDict.get("mixture") + '<' + + thermoTypeDict.get("transport") + '<' + + thermoTypeDict.get("thermo") + '<' + + thermoTypeDict.get("equationOfState") + '<' + + thermoTypeDict.get("specie") + ">>," + + thermoTypeDict.get("energy") + ">>>" ); return lookupThermo @@ -176,7 +176,7 @@ typename Table::iterator Foam::basicThermo::lookupThermo } else { - const word thermoTypeName(thermoDict.lookup("thermoType")); + const word thermoTypeName(thermoDict.get("thermoType")); Info<< "Selecting thermodynamics package " << thermoTypeName << endl; diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C index 593ffe0ea4..e4de507af2 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/chemistryReductionMethod/chemistryReductionMethodNew.C @@ -38,7 +38,7 @@ Foam::chemistryReductionMethod::New { const dictionary& reductionDict(dict.subDict("reduction")); - const word methodName(reductionDict.lookup("method")); + const word methodName(reductionDict.get("method")); Info<< "Selecting chemistry reduction method " << methodName << endl; diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C index 8247aac4ab..5178200673 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/chemistryTabulationMethod/chemistryTabulationMethodNew.C @@ -38,7 +38,7 @@ Foam::chemistryTabulationMethod::New { const dictionary& tabulationDict(dict.subDict("tabulation")); - const word methodName(tabulationDict.lookup("method")); + const word methodName(tabulationDict.get("method")); Info<< "Selecting chemistry tabulation method " << methodName << endl; const word methodTypeName = diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C index 74d7f074e6..732b7a23a3 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C +++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C @@ -46,11 +46,11 @@ Foam::autoPtr Foam::laminarFlameSpeed::New ) ); - const word corrType(propDict.lookup("laminarFlameSpeedCorrelation")); + const word modelType(propDict.get("laminarFlameSpeedCorrelation")); - Info<< "Selecting laminar flame speed correlation " << corrType << endl; + Info<< "Selecting laminar flame speed correlation " << modelType << endl; - auto cstrIter = dictionaryConstructorTablePtr_->cfind(corrType); + auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType); if (!cstrIter.found()) { @@ -58,7 +58,7 @@ Foam::autoPtr Foam::laminarFlameSpeed::New ( propDict ) << "Unknown laminarFlameSpeed type " - << corrType << nl << nl + << modelType << nl << nl << "Valid laminarFlameSpeed types :" << endl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C index 9f023aba89..07c5c1112c 100644 --- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C +++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C @@ -80,7 +80,7 @@ Foam::radiation::radiationModel::New const volScalarField& T ) { - const word modelType(dict.lookup("radiationModel")); + const word modelType(dict.get("radiationModel")); Info<< "Selecting radiationModel " << modelType << endl; diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C index 82b6e9b0c2..1728c9426a 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C @@ -35,7 +35,7 @@ Foam::radiation::absorptionEmissionModel::New const fvMesh& mesh ) { - const word modelType(dict.lookup("absorptionEmissionModel")); + const word modelType(dict.get("absorptionEmissionModel")); Info<< "Selecting absorptionEmissionModel " << modelType << endl; diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C index c742a18f6f..b8dc59c140 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C @@ -34,7 +34,7 @@ Foam::autoPtr Foam::radiation::scatterModel::New const fvMesh& mesh ) { - const word modelType(dict.lookup("scatterModel")); + const word modelType(dict.get("scatterModel")); Info<< "Selecting scatterModel " << modelType << endl; diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C index da82c756f9..0860e289c8 100644 --- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C +++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C @@ -35,7 +35,7 @@ transmissivityModel::New const fvMesh& mesh ) { - const word modelType(dict.lookup("transmissivityModel")); + const word modelType(dict.get("transmissivityModel")); Info<< "Selecting transmissivityModel " << modelType << endl; diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C index 7bcc83b5ec..0e7f7551ee 100644 --- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C +++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModelNew.C @@ -82,30 +82,30 @@ Foam::basicSolidChemistryModel::New(solidReactionThermo& thermo) ); const dictionary& solidThermoTypeDict(thermoDict.subDict("thermoType")); - word solidThermoTypeName + const word solidThermoTypeName ( - word(solidThermoTypeDict.lookup("transport")) + '<' - + word(solidThermoTypeDict.lookup("thermo")) + '<' - + word(solidThermoTypeDict.lookup("equationOfState")) + '<' - + word(solidThermoTypeDict.lookup("specie")) + ">>," - + word(solidThermoTypeDict.lookup("energy")) + ">" + solidThermoTypeDict.get("transport") + '<' + + solidThermoTypeDict.get("thermo") + '<' + + solidThermoTypeDict.get("equationOfState") + '<' + + solidThermoTypeDict.get("specie") + ">>," + + solidThermoTypeDict.get("energy") + ">" ); const dictionary& gasThermoTypeDict(thermoDict.subDict("gasThermoType")); - word gasThermoTypeName + const word gasThermoTypeName ( - word(gasThermoTypeDict.lookup("transport")) + '<' - + word(gasThermoTypeDict.lookup("thermo")) + '<' - + word(gasThermoTypeDict.lookup("equationOfState")) + '<' - + word(gasThermoTypeDict.lookup("specie")) + ">>," - + word(gasThermoTypeDict.lookup("energy")) + ">" + gasThermoTypeDict.get("transport") + '<' + + gasThermoTypeDict.get("thermo") + '<' + + gasThermoTypeDict.get("equationOfState") + '<' + + gasThermoTypeDict.get("specie") + ">>," + + gasThermoTypeDict.get("energy") + ">" ); // Construct the name of the chemistry type from the components - word chemistryTypeName + const word chemistryTypeName ( - word(chemistryTypeDict.lookup("chemistrySolver")) + '<' - + word(chemistryTypeDict.lookup("chemistryThermo")) + '<' + chemistryTypeDict.get("chemistrySolver") + '<' + + chemistryTypeDict.get("chemistryThermo") + '<' + typeName + ',' + solidThermoTypeName + ',' + gasThermoTypeName + ">>" ); diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index 913f11a712..66c944a8eb 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -359,7 +359,7 @@ Foam::Reaction::New const dictionary& dict ) { - const word& reactionTypeName = dict.lookup("type"); + const word reactionTypeName(dict.get("type")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(reactionTypeName); diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C index d88b584de1..ed606e702a 100644 --- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C +++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C @@ -80,7 +80,7 @@ Foam::autoPtr Foam::thermophysicalFunction::New << endl; } - const word functionType(dict.lookup("functionType")); + const word functionType(dict.get("functionType")); auto cstrIter = dictionaryConstructorTablePtr_->cfind(functionType); diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C index 432fff4c34..956a31ee94 100644 --- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C +++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C @@ -76,7 +76,10 @@ void Foam::linearValveFvMesh::addZonesAndModifiers() List fz(3); // Inner slider - const word innerSliderName(motionDict_.subDict("slider").lookup("inside")); + const word innerSliderName + ( + motionDict_.subDict("slider").get("inside") + ); const polyPatch& innerSlider = boundaryMesh()[innerSliderName]; fz[0] = new faceZone @@ -89,7 +92,10 @@ void Foam::linearValveFvMesh::addZonesAndModifiers() ); // Outer slider - const word outerSliderName(motionDict_.subDict("slider").lookup("outside")); + const word outerSliderName + ( + motionDict_.subDict("slider").get("outside") + ); const polyPatch& outerSlider = boundaryMesh()[outerSliderName]; fz[1] = new faceZone diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C index 7c733c2343..259587339a 100644 --- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C +++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C @@ -83,7 +83,10 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers() // Do face zones for slider // Inner slider - const word innerSliderName(motionDict_.subDict("slider").lookup("inside")); + const word innerSliderName + ( + motionDict_.subDict("slider").get("inside") + ); const polyPatch& innerSlider = boundaryMesh()[innerSliderName]; fz[0] = new faceZone @@ -96,7 +99,10 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers() ); // Outer slider - const word outerSliderName(motionDict_.subDict("slider").lookup("outside")); + const word outerSliderName + ( + motionDict_.subDict("slider").get("outside") + ); const polyPatch& outerSlider = boundaryMesh()[outerSliderName]; fz[1] = new faceZone @@ -114,7 +120,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers() // Add face zone for layer addition const word layerPatchName ( - motionDict_.subDict("layer").lookup("patch") + motionDict_.subDict("layer").get("patch") ); const polyPatch& layerPatch = boundaryMesh()[layerPatchName]; @@ -275,7 +281,7 @@ Foam::tmp Foam::linearValveLayersFvMesh::newPoints() const const word layerPatchName ( - motionDict_.subDict("layer").lookup("patch") + motionDict_.subDict("layer").get("patch") ); const polyPatch& layerPatch = boundaryMesh()[layerPatchName]; @@ -284,7 +290,7 @@ Foam::tmp Foam::linearValveLayersFvMesh::newPoints() const const vector vel ( - motionDict_.lookup("pistonVelocity") + motionDict_.get("pistonVelocity") ); forAll(patchPoints, ppI) diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C index 6686df17aa..f127828a69 100644 --- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C +++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C @@ -76,7 +76,10 @@ void Foam::mixerFvMesh::addZonesAndModifiers() List fz(3); // Inner slider - const word innerSliderName(motionDict_.subDict("slider").lookup("inside")); + const word innerSliderName + ( + motionDict_.subDict("slider").get("inside") + ); const polyPatch& innerSlider = boundaryMesh()[innerSliderName]; fz[0] = new faceZone @@ -89,7 +92,10 @@ void Foam::mixerFvMesh::addZonesAndModifiers() ); // Outer slider - const word outerSliderName(motionDict_.subDict("slider").lookup("outside")); + const word outerSliderName + ( + motionDict_.subDict("slider").get("outside") + ); const polyPatch& outerSlider = boundaryMesh()[outerSliderName]; fz[1] = new faceZone