From 9fbe68fca6870e501658c1d87df4da7e892897c0 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 11 May 2017 14:42:59 +0100 Subject: [PATCH] Replacing const_cast lookupObject to lookupObjectRef --- .../IATEsource/wallBoiling.C | 13 ++++----- .../fvMotionSolverEngineMesh.C | 5 ++-- .../layeredEngineMesh/layeredEngineMesh.C | 5 ++-- .../CrankNicolsonDdtScheme.C | 5 +--- .../gradSchemes/gradScheme/gradScheme.C | 27 +++++++++---------- .../LimitedScheme/LimitedScheme.C | 9 +++---- .../volPointInterpolate.C | 18 +++++++------ .../field/CourantNo/CourantNo.C | 10 ++----- .../fieldAverage/fieldAverageTemplates.C | 18 +++++-------- .../field/processorField/processorField.C | 12 +++------ .../field/wallShearStress/wallShearStress.C | 7 ++--- src/functionObjects/field/yPlus/yPlus.C | 7 ++--- .../removeRegisteredObject.C | 8 +++--- ...polatedDisplacementPointPatchVectorField.C | 13 +++------ .../tabulatedAccelerationSourceTemplates.C | 18 ++++--------- .../basic/basicThermo/basicThermo.C | 5 +--- .../greyMeanAbsorptionEmission.C | 15 ++--------- .../wideBandAbsorptionEmission.C | 5 +--- .../rawTopoChangerFvMesh.C | 7 ++--- .../rawTopoChangerFvMeshTemplates.C | 7 ++--- 20 files changed, 70 insertions(+), 144 deletions(-) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/IATEsource/wallBoiling.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/IATEsource/wallBoiling.C index c21e38a0a..bac1c27b7 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/IATEsource/wallBoiling.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/IATEsource/wallBoiling.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,15 +90,12 @@ Foam::diameterModels::IATEsources::wallBoiling::R ); const phaseCompressibleTurbulenceModel& turbulence = - const_cast + phase().db().lookupObjectRef ( - phase().db().lookupObject + IOobject::groupName ( - IOobject::groupName - ( - turbulenceModel::propertiesName, - otherPhase().name() - ) + turbulenceModel::propertiesName, + otherPhase().name() ) ); diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C index 2238fe09d..aba57144d 100644 --- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C +++ b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -91,8 +91,7 @@ void Foam::fvMotionSolverEngineMesh::move() if (engineDB_.foundObject("phi")) { surfaceScalarField& phi = - const_cast - (engineDB_.lookupObject("phi")); + engineDB_.lookupObjectRef("phi"); const volScalarField& rho = engineDB_.lookupObject("rho"); diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C index 390994257..3ade0fe83 100644 --- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C +++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,8 +86,7 @@ void Foam::layeredEngineMesh::move() if (engineDB_.foundObject("phi")) { surfaceScalarField& phi = - const_cast - (engineDB_.lookupObject("phi")); + engineDB_.lookupObjectRef("phi"); const volScalarField& rho = engineDB_.lookupObject("rho"); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index bfbc7cf9d..4a6bae36f 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C @@ -172,10 +172,7 @@ CrankNicolsonDdtScheme::ddt0_ DDt0Field& ddt0 = static_cast&> ( - const_cast - ( - mesh().objectRegistry::template lookupObject(name) - ) + mesh().objectRegistry::template lookupObjectRef(name) ); return ddt0; diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C index 2c045538e..dedfc643e 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -109,10 +109,11 @@ Foam::fv::gradScheme::grad } solution::cachePrintMessage("Retrieving", name, vsf); - GradFieldType& gGrad = const_cast - ( - mesh().objectRegistry::template lookupObject(name) - ); + GradFieldType& gGrad = + mesh().objectRegistry::template lookupObjectRef + ( + name + ); if (gGrad.upToDate(vsf)) { @@ -129,13 +130,11 @@ Foam::fv::gradScheme::grad solution::cachePrintMessage("Storing", name, vsf); regIOobject::store(tgGrad.ptr()); - GradFieldType& gGrad = const_cast - ( - mesh().objectRegistry::template lookupObject + GradFieldType& gGrad = + mesh().objectRegistry::template lookupObjectRef ( name - ) - ); + ); return gGrad; } @@ -144,13 +143,11 @@ Foam::fv::gradScheme::grad { if (mesh().objectRegistry::template foundObject(name)) { - GradFieldType& gGrad = const_cast - ( - mesh().objectRegistry::template lookupObject + GradFieldType& gGrad = + mesh().objectRegistry::template lookupObjectRef ( name - ) - ); + ); if (gGrad.ownedByRegistry()) { diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C index efe01350d..0f6e40e94 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -169,12 +169,9 @@ Foam::LimitedScheme::limiter } surfaceScalarField& limiterField = - const_cast + mesh.lookupObjectRef ( - mesh.lookupObject - ( - limiterFieldName - ) + limiterFieldName ); calcLimiter(phi, limiterField); diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C index 535e31ed7..0ff60aade 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C +++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C @@ -372,10 +372,11 @@ Foam::volPointInterpolation::interpolate // Delete any old occurences to avoid double registration if (db.objectRegistry::template foundObject(name)) { - PointFieldType& pf = const_cast - ( - db.objectRegistry::template lookupObject(name) - ); + PointFieldType& pf = + db.objectRegistry::template lookupObjectRef + ( + name + ); if (pf.ownedByRegistry()) { @@ -417,10 +418,11 @@ Foam::volPointInterpolation::interpolate } else { - PointFieldType& pf = const_cast - ( - db.objectRegistry::template lookupObject(name) - ); + PointFieldType& pf = + db.objectRegistry::template lookupObjectRef + ( + name + ); if (pf.upToDate(vf)) //TBD: , vf.mesh().points())) { diff --git a/src/functionObjects/field/CourantNo/CourantNo.C b/src/functionObjects/field/CourantNo/CourantNo.C index 2f7c73580..1f426c06a 100644 --- a/src/functionObjects/field/CourantNo/CourantNo.C +++ b/src/functionObjects/field/CourantNo/CourantNo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,13 +85,7 @@ bool Foam::functionObjects::CourantNo::calc() if (foundObject(resultName_)) { - volScalarField& Co - ( - const_cast - ( - lookupObject(resultName_) - ) - ); + volScalarField& Co = lookupObjectRef(resultName_); Co.ref() = Coi(); Co.correctBoundaryConditions(); diff --git a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C index 132b8ff00..672ae9068 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C +++ b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C @@ -196,10 +196,8 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType { const Type& baseField = obr_.lookupObject(fieldName); - Type& meanField = const_cast - ( - obr_.lookupObject(faItems_[fieldi].meanFieldName()) - ); + Type& meanField = + obr_.lookupObjectRef(faItems_[fieldi].meanFieldName()); scalar dt = obr_.time().deltaTValue(); scalar Dt = totalTime_[fieldi]; @@ -258,10 +256,8 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType const Type1& meanField = obr_.lookupObject(faItems_[fieldi].meanFieldName()); - Type2& prime2MeanField = const_cast - ( - obr_.lookupObject(faItems_[fieldi].prime2MeanFieldName()) - ); + Type2& prime2MeanField = + obr_.lookupObjectRef(faItems_[fieldi].prime2MeanFieldName()); scalar dt = obr_.time().deltaTValue(); scalar Dt = totalTime_[fieldi]; @@ -328,10 +324,8 @@ void Foam::functionObjects::fieldAverage::addMeanSqrToPrime2MeanType const Type1& meanField = obr_.lookupObject(faItems_[fieldi].meanFieldName()); - Type2& prime2MeanField = const_cast - ( - obr_.lookupObject(faItems_[fieldi].prime2MeanFieldName()) - ); + Type2& prime2MeanField = + obr_.lookupObjectRef(faItems_[fieldi].prime2MeanFieldName()); prime2MeanField += sqr(meanField); } diff --git a/src/functionObjects/field/processorField/processorField.C b/src/functionObjects/field/processorField/processorField.C index e30ab4de9..adff4ae3d 100644 --- a/src/functionObjects/field/processorField/processorField.C +++ b/src/functionObjects/field/processorField/processorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -91,10 +91,7 @@ bool Foam::functionObjects::processorField::read(const dictionary& dict) bool Foam::functionObjects::processorField::execute() { - const volScalarField& procField = - mesh_.lookupObject("processorID"); - - const_cast(procField) == + mesh_.lookupObjectRef("processorID") == dimensionedScalar("proci", dimless, Pstream::myProcNo()); return true; @@ -103,10 +100,7 @@ bool Foam::functionObjects::processorField::execute() bool Foam::functionObjects::processorField::write() { - const volScalarField& procField = - mesh_.lookupObject("processorID"); - - procField.write(); + mesh_.lookupObject("processorID").write(); return true; } diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C index 06b7bb9d9..bb47362ef 100644 --- a/src/functionObjects/field/wallShearStress/wallShearStress.C +++ b/src/functionObjects/field/wallShearStress/wallShearStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -193,10 +193,7 @@ bool Foam::functionObjects::wallShearStress::execute() typedef incompressible::turbulenceModel icoModel; volVectorField& wallShearStress = - const_cast - ( - mesh_.lookupObject(type()) - ); + mesh_.lookupObjectRef(type()); tmp Reff; if (mesh_.foundObject(turbulenceModel::propertiesName)) diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C index 1116eac3f..65fbfab2a 100644 --- a/src/functionObjects/field/yPlus/yPlus.C +++ b/src/functionObjects/field/yPlus/yPlus.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -169,10 +169,7 @@ bool Foam::functionObjects::yPlus::read(const dictionary& dict) bool Foam::functionObjects::yPlus::execute() { volScalarField& yPlus = - const_cast - ( - mesh_.lookupObject(type()) - ); + mesh_.lookupObjectRef(type()); if (mesh_.foundObject(turbulenceModel::propertiesName)) { diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C index 6fd2a80ee..81d4fde31 100644 --- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C +++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -91,8 +91,8 @@ bool Foam::functionObjects::removeRegisteredObject::execute() { if (obr_.foundObject(objectNames_[i])) { - const regIOobject& obj = - obr_.lookupObject(objectNames_[i]); + regIOobject& obj = + obr_.lookupObjectRef(objectNames_[i]); if (obj.ownedByRegistry()) { @@ -100,7 +100,7 @@ bool Foam::functionObjects::removeRegisteredObject::execute() << " removing object " << obj.name() << nl << endl; - const_cast(obj).release(); + obj.release(); delete &obj; } } diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C index fa5d0278e..66fb41a76 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -210,15 +210,8 @@ void uniformInterpolatedDisplacementPointPatchVectorField::updateCoeffs() const objectRegistry& >(*fieldsCacheIter()); - - pointVectorField& d = const_cast - ( - timeCache.lookupObject - ( - fieldName_ - ) - ); - d.correctBoundaryConditions(); + timeCache.lookupObjectRef(fieldName_) + .correctBoundaryConditions(); } } } diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSourceTemplates.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSourceTemplates.C index af03ba7ae..bc1f0042b 100644 --- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSourceTemplates.C +++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSourceTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,10 +44,7 @@ void Foam::fv::tabulatedAccelerationSource::addSup if (mesh_.foundObject("g")) { uniformDimensionedVectorField& g = - const_cast - ( - mesh_.lookupObject("g") - ); + mesh_.lookupObjectRef("g"); const uniformDimensionedScalarField& hRef = mesh_.lookupObject("hRef"); @@ -61,15 +58,10 @@ void Foam::fv::tabulatedAccelerationSource::addSup : dimensionedScalar("ghRef", g.dimensions()*dimLength, 0) ); - const_cast - ( - mesh_.lookupObject("gh") - ) = (g & mesh_.C()) - ghRef; + mesh_.lookupObjectRef("gh") = (g & mesh_.C()) - ghRef; - const_cast - ( - mesh_.lookupObject("ghf") - ) = (g & mesh_.Cf()) - ghRef; + mesh_.lookupObjectRef("ghf") = + (g & mesh_.Cf()) - ghRef; } // ... otherwise include explicitly in the momentum equation else diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C index a5acf77a3..1ab32893c 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C @@ -152,10 +152,7 @@ Foam::volScalarField& Foam::basicThermo::lookupOrConstruct fPtr->store(fPtr); } - return const_cast - ( - mesh.objectRegistry::lookupObject(name) - ); + return mesh.objectRegistry::lookupObjectRef(name); } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C index 3d89c9c92..e52082823 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C @@ -133,12 +133,7 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission } else if (mesh.foundObject(iter.key())) { - volScalarField& Y = - const_cast - ( - mesh.lookupObject(iter.key()) - ); - Yj_.set(j, &Y); + Yj_.set(j, &mesh.lookupObjectRef(iter.key())); specieIndex_[iter()] = 0; j++; Info<< "specie: " << iter.key() << " is being solved" << endl; @@ -155,13 +150,7 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission } else if (mesh.foundObject(iter.key())) { - volScalarField& Y = - const_cast - ( - mesh.lookupObject(iter.key()) - ); - - Yj_.set(j, &Y); + Yj_.set(j, &mesh.lookupObjectRef(iter.key())); specieIndex_[iter()] = 0; j++; } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C index b39014bcc..aa0f3829a 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C @@ -121,10 +121,7 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission } else if (mesh.foundObject(iter.key())) { - volScalarField& Y = const_cast - (mesh.lookupObject(iter.key())); - - Yj_.set(j, &Y); + Yj_.set(j, &mesh.lookupObjectRef(iter.key())); specieIndex_[iter()] = 0.0; j++; diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C index a2411f218..686b4c7a9 100644 --- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C +++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -142,10 +142,7 @@ bool Foam::rawTopoChangerFvMesh::update() Info<< "rawTopoChangerFvMesh :" << " recreating phi for unmapped boundary values." << endl; const volVectorField& U = lookupObject("U"); - surfaceScalarField& phi = const_cast - ( - lookupObject("phi") - ); + surfaceScalarField& phi = lookupObjectRef("phi"); setUnmappedValues ( phi, diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C index fbad1eed4..4dc453e90 100644 --- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C +++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,10 +75,7 @@ void Foam::rawTopoChangerFvMesh::zeroUnmappedValues { //Pout<< "Checking field " << fldNames[i] << endl; - FieldType& fld = const_cast - ( - lookupObject(fldNames[i]) - ); + FieldType& fld = lookupObjectRef(fldNames[i]); setUnmappedValues (