From 8eddcc072a3d705faa3915cc633da44146ffd48c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 12 Oct 2018 08:14:47 +0200 Subject: [PATCH] ENH: avoid readScalar, readLabel etc from dictionary (#762, #1033) - use the dictionary 'get' methods instead of readScalar for additional checking Unchecked: readScalar(dict.lookup("key")); Checked: dict.get("key"); - In templated classes that also inherit from a dictionary, an additional 'template' keyword will be required. Eg, this->coeffsDict().template get("key"); For this common use case, the predefined getXXX shortcuts may be useful. Eg, this->coeffsDict().getScalar("key"); --- .../XiGModels/basicXiSubG/basicXiSubG.C | 2 +- .../XiModels/XiEqModels/Gulder/Gulder.C | 9 +-- .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 13 ++- .../instabilityXiEq/instabilityXiEq.C | 2 +- .../PDRFoam/XiModels/XiGModels/KTS/KTS.C | 2 +- .../PDRFoam/XiModels/algebraic/algebraic.C | 2 +- .../PDRFoam/XiModels/transport/transport.C | 2 +- .../SCOPE/SCOPELaminarFlameSpeed.C | 31 +++---- .../combustion/chemFoam/createFields.H | 4 +- .../chemFoam/readInitialConditions.H | 4 +- .../combustion/reactingFoam/setRDeltaT.H | 4 +- .../T/smoluchowskiJumpTFvPatchScalarField.C | 2 +- .../BCs/U/maxwellSlipUFvPatchVectorField.C | 2 +- .../rhoPimpleAdiabaticFoam/EEqn.H | 4 +- .../readmdEquilibrationDict.H | 4 +- .../solvers/lagrangian/DPMFoam/createFields.H | 5 +- .../lagrangian/coalChemistryFoam/setRDeltaT.H | 2 +- .../reactingParcelFoam/setRDeltaT.H | 2 +- .../multiphase/MPPICInterFoam/createFields.H | 5 +- .../solvers/multiphase/VoF/alphaCourantNo.H | 2 +- .../cavitatingDyMFoam/createControls.H | 2 +- .../cavitatingFoam/cavitatingDyMFoam/pEqn.H | 4 +- .../cavitatingFoam/createControls.H | 2 +- .../solvers/multiphase/cavitatingFoam/pEqn.H | 4 +- .../multiphaseMixtureThermo.C | 4 +- .../multiphase/driftFluxFoam/alphaControls.H | 4 +- .../alphaCourantNo.H | 2 +- .../laserDTRM/laserDTRM.C | 14 ++-- .../FresnelLaser/FresnelLaser.C | 2 +- .../VollerPrakash/VollerPrakash.C | 4 +- .../MultiComponentPhaseModel.C | 2 +- .../multiphaseSystem/multiphaseSystem.C | 4 +- ...newtemperaturePhaseChangeTwoPhaseMixture.C | 5 +- .../interFoam/interMixingFoam/alphaControls.H | 4 +- .../threePhaseInterfaceProperties.C | 9 +-- .../overInterDyMFoam/alphaCourantNo.H | 2 +- .../multiphase/interIsoFoam/alphaControls.H | 2 +- .../multiphase/interIsoFoam/alphaCourantNo.H | 2 +- .../interPhaseChangeFoam/alphaControls.H | 4 +- .../multiphaseSystem/multiphaseSystem.C | 2 +- .../multiphaseMixture/multiphaseMixture.C | 4 +- .../wallLubricationModels/Frank/Frank.C | 2 +- .../multiphaseSystem/multiphaseSystem.C | 2 +- .../KocamustafaogullariIshii.C | 2 +- .../Lavieville/Lavieville.C | 2 +- .../partitioningModels/cosine/cosine.C | 4 +- .../partitioningModels/linear/linear.C | 4 +- .../phasePressureModel/phasePressureModel.C | 6 +- .../twoPhaseSystem/twoPhaseSystem.C | 4 +- .../twoLiquidMixingFoam/alphaControls.H | 2 +- .../twoLiquidMixingFoam/alphaCourantNo.H | 2 +- .../wallLubricationModels/Frank/Frank.C | 2 +- .../phasePressureModel/phasePressureModel.C | 6 +- .../twoPhaseSystem/twoPhaseSystem.C | 4 +- .../readMechanicalProperties.H | 12 +-- .../readThermalProperties.H | 12 +-- .../readSteadyStressFoamControls.H | 2 +- applications/test/Function1/Test-Function1.C | 4 +- .../pendulumAndSpring/pendulumAndSpring.C | 2 +- .../sphericalJoint/sphericalJoint.C | 2 +- .../test/rigidBodyDynamics/spring/spring.C | 2 +- .../conformalVoronoiMeshCalcDualMesh.C | 2 +- .../conformalVoronoiMeshIO.C | 2 +- etc/codeTemplates/BC/BC.C | 2 +- src/OpenFOAM/db/dictionary/dictionary.H | 32 +++++++- src/OpenFOAM/global/argList/argList.C | 2 +- .../interpolationLookUpTable.C | 12 +-- .../tableReaders/csv/csvTableReader.C | 6 +- .../uniformInterpolationTable.C | 6 +- .../dummyAgglomeration/dummyAgglomeration.C | 2 +- .../procFacesGAMGProcAgglomeration.C | 2 +- src/OpenFOAM/matrices/solution/solution.C | 20 ++--- src/OpenFOAM/matrices/tolerances/tolerances.C | 6 +- .../constraint/processor/processorPolyPatch.C | 4 +- .../polyPatches/polyPatch/polyPatch.C | 6 +- .../primitives/functions/Function1/CSV/CSV.C | 10 +-- .../functions/Function1/ramp/ramp.C | 2 +- ...convectiveHeatTransferFvPatchScalarField.C | 2 +- ...pedMassWallTemperatureFvPatchScalarField.C | 4 +- ...tletMachNumberPressureFvPatchScalarField.C | 2 +- ...ppedUniformInletHeatAdditionFvPatchField.C | 2 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 2 +- .../LES/LESdeltas/smoothDelta/smoothDelta.C | 5 +- .../anisotropicFilter/anisotropicFilter.C | 2 +- .../LESfilters/laplaceFilter/laplaceFilter.C | 2 +- ...thDissipationRateInletFvPatchScalarField.C | 2 +- ...ngLengthFrequencyInletFvPatchScalarField.C | 2 +- .../porousBafflePressureFvPatchField.C | 2 +- .../nutURoughWallFunctionFvPatchScalarField.C | 6 +- .../atmBoundaryLayer/atmBoundaryLayer.C | 4 +- .../kEpsilonLopesdaCosta.C | 4 +- .../powerLawLopesdaCosta.C | 6 +- src/combustionModels/FSD/FSD.C | 4 +- .../consumptionSpeed/consumptionSpeed.C | 8 +- .../relaxation/relaxation.C | 7 +- src/combustionModels/PaSR/PaSR.C | 2 +- src/combustionModels/diffusion/diffusion.C | 2 +- .../eddyDissipationDiffusionModel.C | 2 +- .../eddyDissipationModelBase.C | 2 +- .../infinitelyFastChemistry.C | 2 +- .../singleStepCombustion.C | 2 +- src/conversion/ccm/writer/ccmWriterSolution.C | 2 +- .../dynamicInkJetFvMesh/dynamicInkJetFvMesh.C | 6 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 24 +++--- src/dynamicMesh/boundaryPatch/boundaryPatch.C | 4 +- .../extrudePatchMesh/extrudePatchMesh.C | 2 +- .../layerAdditionRemoval.C | 4 +- .../motionSmoother/motionSmootherAlgo.C | 10 +-- .../motionSmoother/motionSmootherAlgoCheck.C | 48 +++++------ .../perfectInterface/perfectInterface.C | 2 +- .../polyMeshFilter/polyMeshFilterSettings.C | 4 +- src/engine/ignition/ignitionSiteIO.C | 22 +++-- src/engine/include/StCorr.H | 14 +--- .../constraint/processor/processorFaPatch.H | 4 +- .../cfdTools/general/SRF/SRFModel/rpm/rpm.C | 2 +- .../general/findRefCell/findRefCell.C | 12 ++- .../cfdTools/general/include/alphaControls.H | 4 +- .../general/pressureControl/pressureControl.C | 26 +++--- .../solutionControl/solutionControl.C | 12 +-- .../activeBaffleVelocityFvPatchVectorField.C | 8 +- ...ureForceBaffleVelocityFvPatchVectorField.C | 12 +-- .../fixedProfile/fixedProfileFvPatchField.C | 2 +- ...OutletTotalTemperatureFvPatchScalarField.C | 2 +- ...utletPhaseMeanVelocityFvPatchVectorField.C | 2 +- ...aseHydrostaticPressureFvPatchScalarField.C | 4 +- .../plenumPressureFvPatchScalarField.C | 24 +++--- ...IDControlInletVelocityFvPatchVectorField.C | 8 +- .../supersonicFreestreamFvPatchVectorField.C | 6 +- .../syringePressureFvPatchScalarField.C | 20 ++--- .../totalPressureFvPatchScalarField.C | 2 +- .../totalTemperatureFvPatchScalarField.C | 2 +- .../turbulentDFSEMInletFvPatchVectorField.C | 2 +- ...sityKineticEnergyInletFvPatchScalarField.C | 2 +- ...ityHydrostaticPressureFvPatchScalarField.C | 4 +- .../uniformTotalPressureFvPatchScalarField.C | 2 +- .../variableHeightFlowRateFvPatchField.C | 4 +- .../waveTransmissiveFvPatchField.C | 2 +- .../solvers/MULES/CMULESTemplates.C | 2 +- .../columnFvMesh/columnFvMesh.C | 8 +- .../field/nearWallFields/nearWallFields.C | 2 +- .../field/valueAverage/valueAverage.C | 2 +- .../MGridGenGAMGAgglomeration.C | 6 +- .../pairPatchAgglomeration.C | 4 +- .../surfaceAlignedSBRStressFvMotionSolver.C | 2 +- ...llatingDisplacementPointPatchVectorField.C | 6 +- ...OscillatingVelocityPointPatchVectorField.C | 6 +- ...llatingDisplacementPointPatchVectorField.C | 2 +- ...oscillatingVelocityPointPatchVectorField.C | 2 +- .../waveDisplacementPointPatchVectorField.C | 2 +- .../velocityDampingConstraint.C | 2 +- .../trimModel/targetCoeff/targetCoeffTrim.C | 8 +- .../solidificationMeltingSource.C | 2 +- .../variableHeatTransfer.C | 11 +-- .../clouds/Templates/DSMCCloud/DSMCCloud.C | 13 ++- .../Templates/DSMCParcel/DSMCParcelI.H | 11 +-- .../LarsenBorgnakkeVariableHardSphere.C | 4 +- .../VariableHardSphere/VariableHardSphere.C | 2 +- .../FreeStream/FreeStream.C | 7 +- .../MixedDiffuseSpecular.C | 2 +- .../COxidationDiffusionLimitedRate.C | 4 +- .../COxidationHurtMitchell.C | 2 +- .../COxidationIntrinsicRate.C | 14 ++-- .../COxidationKineticDiffusionLimitedRate.C | 8 +- .../COxidationMurphyShaddix.C | 16 ++-- .../RosinRammler/RosinRammler.C | 8 +- .../exponential/exponential.C | 6 +- .../fixedValue/fixedValue.C | 2 +- .../massRosinRammler/massRosinRammler.C | 8 +- .../multiNormal/multiNormal.C | 4 +- .../distributionModels/normal/normal.C | 8 +- .../distributionModels/uniform/uniform.C | 4 +- .../ParticleCollector/ParticleCollector.C | 7 +- .../ParticleErosion/ParticleErosion.C | 2 +- .../ParticleTracks/ParticleTracks.C | 4 +- .../ParticleTrap/ParticleTrap.C | 2 +- .../PatchPostProcessing/PatchPostProcessing.C | 2 +- .../PairCollision/PairCollision.C | 2 +- .../PairSpringSliderDashpot.C | 12 +-- .../WallLocalSpringSliderDashpot.C | 23 +++--- .../WallSpringSliderDashpot.C | 19 ++--- .../CellZoneInjection/CellZoneInjection.C | 2 +- .../ConeInjection/ConeInjection.C | 4 +- .../ConeNozzleInjection/ConeNozzleInjection.C | 11 +-- .../FieldActivatedInjection.C | 4 +- .../InflationInjection/InflationInjection.C | 4 +- .../InjectedParticleDistributionInjection.C | 8 +- .../InjectionModel/InjectionModel.C | 6 +- .../KinematicLookupTableInjection.C | 9 +-- .../kinematicParcelInjectionData.C | 6 +- .../PatchFlowRateInjection.C | 4 +- .../PatchInjection/PatchInjection.C | 4 +- .../Drag/NonSphereDrag/NonSphereDragForce.C | 2 +- .../ParticleForces/Interface/InterfaceForce.C | 2 +- .../Lift/TomiyamaLift/TomiyamaLiftForce.C | 2 +- .../Paramagnetic/ParamagneticForce.C | 2 +- .../VirtualMass/VirtualMassForce.C | 2 +- .../MultiInteraction/MultiInteraction.C | 3 +- .../PatchInteractionModel/Rebound/Rebound.C | 2 +- .../absolute/absolute.C | 2 +- .../relative/relative.C | 2 +- .../MPPIC/PackingModels/Implicit/Implicit.C | 4 +- .../HarrisCrighton/HarrisCrighton.C | 6 +- .../MPPIC/ParticleStressModels/Lun/Lun.C | 4 +- .../ParticleStressModel/ParticleStressModel.C | 8 +- .../exponential/exponential.C | 6 +- .../TimeScaleModel/TimeScaleModel.C | 4 +- .../ReactingLookupTableInjection.C | 9 +-- .../ConstantRateDevolatilisation.C | 2 +- .../SingleKineticRateDevolatilisation.C | 2 +- .../ReactingMultiphaseLookupTableInjection.C | 9 +-- .../ThermoLookupTableInjection.C | 9 +-- .../thermoParcelInjectionData.C | 4 +- .../correlationFunction/correlationFunction.C | 13 ++- .../molecule/moleculeCloud/moleculeCloud.C | 19 +++-- .../molecule/reducedUnits/reducedUnits.C | 6 +- .../derived/doubleSigmoid/doubleSigmoid.C | 8 +- .../derived/sigmoid/sigmoid.C | 4 +- .../pairPotential/basic/pairPotential.C | 6 +- .../pairPotential/derived/azizChen/azizChen.C | 18 ++--- .../derived/dampedCoulomb/dampedCoulomb.C | 2 +- .../exponentialRepulsion.C | 4 +- .../derived/lennardJones/lennardJones.C | 4 +- .../derived/maitlandSmith/maitlandSmith.C | 8 +- .../potential/potential/potential.C | 5 +- .../derived/harmonicSpring/harmonicSpring.C | 2 +- .../derived/pitchForkRing/pitchForkRing.C | 6 +- .../restrainedHarmonicSpring.C | 4 +- .../BlobsSheetAtomization.C | 4 +- .../LISAAtomization/LISAAtomization.C | 15 ++-- .../BreakupModel/BreakupModel/BreakupModel.C | 3 +- .../spray/submodels/BreakupModel/SHF/SHF.C | 58 ++++++------- .../TrajectoryCollision/TrajectoryCollision.C | 4 +- .../BrownianMotion/BrownianMotionForce.C | 4 +- .../extrudeModel/linearNormal/linearNormal.C | 2 +- .../extrudeModel/linearRadial/linearRadial.C | 2 +- src/mesh/extrudeModel/sector/sector.C | 2 +- .../extrudeModel/sigmaRadial/sigmaRadial.C | 6 +- .../displacementMotionSolverMeshMover.C | 10 +-- .../medialAxisMeshMover.C | 35 ++++---- .../meshRefinementProblemCells.C | 10 +-- .../refinementFeatures/refinementFeatures.C | 4 +- .../refinementSurfaces/refinementSurfaces.C | 5 +- .../layerParameters/layerParameters.C | 22 ++--- .../refinementParameters.C | 12 +-- .../snapParameters/snapParameters.C | 8 +- .../surfaceFeatures/surfaceFeatures.C | 8 +- .../decompositionMethod/decompositionMethod.C | 2 +- .../distributedTriSurfaceMesh.C | 2 +- ...sRadiativeCoupledMixedFvPatchScalarField.C | 4 +- .../kinematicSingleLayer.C | 4 +- .../liquidFilmThermo/liquidFilmThermo.C | 2 +- .../filmTurbulenceModel/laminar/laminar.C | 2 +- .../contactAngleForce/contactAngleForce.C | 4 +- .../drippingInjection/drippingInjection.C | 4 +- .../constantRadiation/constantRadiation.C | 6 +- .../standardRadiation/standardRadiation.C | 4 +- .../constantHeatTransfer.C | 2 +- .../solidification/solidification.C | 2 +- .../standardPhaseChange/standardPhaseChange.C | 4 +- .../waxSolventEvaporation.C | 8 +- .../thermoSingleLayer/thermoSingleLayer.C | 4 +- .../thermalBaffleFvPatchScalarField.C | 27 +++---- .../thermalBaffle/thermalBaffle.C | 4 +- .../springRenumber/springRenumber.C | 6 +- src/rigidBodyDynamics/bodies/cuboid/cuboidI.H | 6 +- src/rigidBodyDynamics/bodies/sphere/sphereI.H | 6 +- .../rigidBodyInertia/rigidBodyInertiaI.H | 2 +- .../rigidBodyMeshMotion/rigidBodyMeshMotion.C | 8 +- .../rigidBodyMeshMotionSolver.C | 4 +- ...gidBodyDisplacementPointPatchVectorField.C | 2 +- .../sixDoFRigidBodyMotion.C | 2 +- .../sixDoFRigidBodyMotionSolver.C | 6 +- .../TDACChemistryModel/reduction/DAC/DAC.C | 2 +- .../TDACChemistryModel/tabulation/ISAT/ISAT.C | 17 ++-- .../tabulation/ISAT/binaryTree/binaryTree.C | 2 +- .../basicChemistryModel/basicChemistryModel.C | 2 +- .../EulerImplicit/EulerImplicit.C | 2 +- .../laminarFlameSpeed/Gulders/Gulders.C | 12 +-- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 12 +-- .../RaviPetersen/RaviPetersen.C | 2 +- .../radiationModels/fvDOM/fvDOM/fvDOM.C | 8 +- .../radiationModels/viewFactor/viewFactor.C | 5 +- .../greyMeanAbsorptionEmission.C | 2 +- .../boundaryRadiationPropertiesPatch.C | 81 ++++++------------- .../solarCalculator/solarCalculator.C | 19 ++--- .../mixtureFractionSoot/mixtureFractionSoot.C | 4 +- .../constantTransmissivity.C | 2 +- .../solidArrheniusReactionRateI.H | 6 +- .../const/constAnIsoSolidTransport.C | 2 +- .../transport/const/constIsoSolidTransport.C | 2 +- .../exponential/exponentialSolidTransport.C | 6 +- .../equationOfState/Boussinesq/Boussinesq.C | 6 +- .../PengRobinsonGas/PengRobinsonGas.C | 8 +- .../adiabaticPerfectFluid.C | 8 +- .../incompressiblePerfectGas.C | 2 +- .../specie/equationOfState/linear/linear.C | 4 +- .../perfectFluid/perfectFluid.C | 4 +- .../equationOfState/rhoConst/rhoConst.C | 2 +- .../ArrheniusReactionRateI.H | 6 +- .../JanevReactionRate/JanevReactionRateI.H | 6 +- .../LandauTellerReactionRateI.H | 10 +-- .../SRIFallOffFunction/SRIFallOffFunctionI.H | 10 +-- .../TroeFallOffFunctionI.H | 8 +- .../powerSeries/powerSeriesReactionRateI.H | 6 +- .../thirdBodyEfficienciesI.H | 2 +- .../specie/specie/specie.C | 2 +- .../specie/thermo/eConst/eConstThermo.C | 4 +- .../specie/thermo/hConst/hConstThermo.C | 4 +- .../thermo/hPolynomial/hPolynomialThermo.C | 4 +- .../specie/thermo/hPower/hPowerThermo.C | 8 +- .../specie/thermo/hRefConst/hRefConstThermo.C | 8 +- .../specie/thermo/janaf/janafThermo.C | 6 +- .../specie/transport/const/constTransport.C | 4 +- .../sutherland/sutherlandTransport.C | 2 +- .../liquidProperties/liquidProperties.C | 20 ++--- .../solidProperties/solidProperties.C | 18 ++--- .../solidProperties/solidProperties.H | 5 +- .../APIdiffCoefFunc/APIdiffCoefFunc.C | 8 +- .../NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C | 12 +-- .../NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C | 10 +-- .../NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C | 10 +-- .../NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C | 8 +- .../NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C | 8 +- .../NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C | 10 +-- .../NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C | 8 +- .../NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C | 12 +-- .../NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C | 10 +-- .../thermophysicalProperties.C | 2 +- ...emperatureCoupledMixedFvPatchScalarField.C | 6 +- .../linearValveLayersFvMesh.C | 10 +-- .../movingConeTopoFvMesh.C | 28 ++----- .../irregularWaveModel/irregularWaveModel.C | 2 +- .../base/regularWaveModel/regularWaveModel.C | 3 +- .../waveGenerationModel/waveGenerationModel.C | 2 +- src/waveModels/waveModel/waveModel.C | 2 +- 335 files changed, 1007 insertions(+), 1127 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C index 04d3b6a5a4..3da7d1af93 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C @@ -49,7 +49,7 @@ Foam::XiGModels::basicSubGrid::basicSubGrid ) : XiGModel(XiGProperties, thermo, turbulence, Su), - k1(readScalar(XiGModelCoeffs_.lookup("k1"))), + k1(XiGModelCoeffs_.get("k1")), XiGModel_(XiGModel::New(XiGModelCoeffs_, thermo, turbulence, Su)) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index acbe023e0c..56ff3ed5ef 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -49,13 +49,10 @@ Foam::XiEqModels::Gulder::Gulder ) : XiEqModel(XiEqProperties, thermo, turbulence, Su), - XiEqCoef_(readScalar(XiEqModelCoeffs_.lookup("XiEqCoef"))), + XiEqCoef_(XiEqModelCoeffs_.get("XiEqCoef")), SuMin_(0.01*Su.average()), - uPrimeCoef_(readScalar(XiEqModelCoeffs_.lookup("uPrimeCoef"))), - subGridSchelkin_ - ( - readBool(XiEqModelCoeffs_.lookup("subGridSchelkin")) - ) + uPrimeCoef_(XiEqModelCoeffs_.get("uPrimeCoef")), + subGridSchelkin_(XiEqModelCoeffs_.get("subGridSchelkin")) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C index 59758b889e..47e03c65ec 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C @@ -49,15 +49,12 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq ) : XiEqModel(XiEqProperties, thermo, turbulence, Su), - XiEqCoef_(readScalar(XiEqModelCoeffs_.lookup("XiEqCoef"))), - XiEqExp_(readScalar(XiEqModelCoeffs_.lookup("XiEqExp"))), - lCoef_(readScalar(XiEqModelCoeffs_.lookup("lCoef"))), + XiEqCoef_(XiEqModelCoeffs_.get("XiEqCoef")), + XiEqExp_(XiEqModelCoeffs_.get("XiEqExp")), + lCoef_(XiEqModelCoeffs_.get("lCoef")), SuMin_(0.01*Su.average()), - uPrimeCoef_(readScalar(XiEqModelCoeffs_.lookup("uPrimeCoef"))), - subGridSchelkin_ - ( - readBool(XiEqModelCoeffs_.lookup("subGridSchelkin")) - ), + uPrimeCoef_(XiEqModelCoeffs_.get("uPrimeCoef")), + subGridSchelkin_(XiEqModelCoeffs_.get("subGridSchelkin")), MaModel ( Su.mesh().lookupObject("combustionProperties"), diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C index 39651e983c..15ee61375c 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C @@ -49,7 +49,7 @@ Foam::XiEqModels::instability::instability ) : XiEqModel(XiEqProperties, thermo, turbulence, Su), - XiEqIn(readScalar(XiEqModelCoeffs_.lookup("XiEqIn"))), + XiEqIn(XiEqModelCoeffs_.get("XiEqIn")), XiEqModel_(XiEqModel::New(XiEqModelCoeffs_, thermo, turbulence, Su)) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C index 5750278f32..58183d1bb4 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C @@ -49,7 +49,7 @@ Foam::XiGModels::KTS::KTS ) : XiGModel(XiGProperties, thermo, turbulence, Su), - GEtaCoef_(readScalar(XiGModelCoeffs_.lookup("GEtaCoef"))) + GEtaCoef_(XiGModelCoeffs_.get("GEtaCoef")) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C index 7908a578b5..f5750ce936 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C @@ -52,7 +52,7 @@ Foam::XiModels::algebraic::algebraic ) : XiModel(XiProperties, thermo, turbulence, Su, rho, b, phi), - XiShapeCoef(readScalar(XiModelCoeffs_.lookup("XiShapeCoef"))), + XiShapeCoef(XiModelCoeffs_.get("XiShapeCoef")), XiEqModel_(XiEqModel::New(XiProperties, thermo, turbulence, Su)), XiGModel_(XiGModel::New(XiProperties, thermo, turbulence, Su)) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C index b23c057a6a..e243b44d9f 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C @@ -57,7 +57,7 @@ Foam::XiModels::transport::transport ) : XiModel(XiProperties, thermo, turbulence, Su, rho, b, phi), - XiShapeCoef(readScalar(XiModelCoeffs_.lookup("XiShapeCoef"))), + XiShapeCoef(XiModelCoeffs_.get("XiShapeCoef")), XiEqModel_(XiEqModel::New(XiProperties, thermo, turbulence, Su)), XiGModel_(XiGModel::New(XiProperties, thermo, turbulence, Su)) {} diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index a6987d2ea0..9798284138 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -53,8 +53,8 @@ Foam::laminarFlameSpeedModels::SCOPE::polynomial::polynomial ) : FixedList(polyDict.lookup("coefficients")), - ll(readScalar(polyDict.lookup("lowerLimit"))), - ul(readScalar(polyDict.lookup("upperLimit"))), + ll(polyDict.get("lowerLimit")), + ul(polyDict.get("upperLimit")), llv(polyPhi(ll, *this)), ulv(polyPhi(ul, *this)), lu(0) @@ -75,39 +75,30 @@ Foam::laminarFlameSpeedModels::SCOPE::SCOPE ( IFstream ( - fileName - ( - dict.lookup("fuelFile") - ) + dict.get("fuelFile") )() ).optionalSubDict(typeName + "Coeffs") ), LFL_ ( - readScalar + coeffsDict_.getCompat ( - coeffsDict_.lookupCompat - ( - "lowerFlammabilityLimit", - {{"lowerFlamabilityLimit", 1712}} - ) + "lowerFlammabilityLimit", + {{"lowerFlamabilityLimit", 1712}} ) ), UFL_ ( - readScalar + coeffsDict_.getCompat ( - coeffsDict_.lookupCompat - ( - "upperFlammabilityLimit", - {{"upperFlamabilityLimit", 1712}} - ) + "upperFlammabilityLimit", + {{"upperFlamabilityLimit", 1712}} ) ), SuPolyL_(coeffsDict_.subDict("lowerSuPolynomial")), SuPolyU_(coeffsDict_.subDict("upperSuPolynomial")), - Texp_(readScalar(coeffsDict_.lookup("Texp"))), - pexp_(readScalar(coeffsDict_.lookup("pexp"))), + Texp_(coeffsDict_.get("Texp")), + pexp_(coeffsDict_.get("pexp")), MaPolyL_(coeffsDict_.subDict("lowerMaPolynomial")), MaPolyU_(coeffsDict_.subDict("upperMaPolynomial")) { diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H index 34fcf68290..7cc28d4562 100644 --- a/applications/solvers/combustion/chemFoam/createFields.H +++ b/applications/solvers/combustion/chemFoam/createFields.H @@ -18,8 +18,8 @@ ) ); - scalar p0 = readScalar(initialConditions.lookup("p")); - scalar T0 = readScalar(initialConditions.lookup("T")); + scalar p0 = initialConditions.get("p"); + scalar T0 = initialConditions.get("T"); #include "createBaseFields.H" diff --git a/applications/solvers/combustion/chemFoam/readInitialConditions.H b/applications/solvers/combustion/chemFoam/readInitialConditions.H index 8e340a7e16..c321fcbf3b 100644 --- a/applications/solvers/combustion/chemFoam/readInitialConditions.H +++ b/applications/solvers/combustion/chemFoam/readInitialConditions.H @@ -40,7 +40,7 @@ const word& name = Y[i].name(); if (fractions.found(name)) { - X0[i] = readScalar(fractions.lookup(name)); + X0[i] = fractions.get(name); } } @@ -64,7 +64,7 @@ const word& name = Y[i].name(); if (fractions.found(name)) { - Y0[i] = readScalar(fractions.lookup(name)); + Y0[i] = fractions.get(name); } } diff --git a/applications/solvers/combustion/reactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H index 2f028e45d2..3b8a3ae96f 100644 --- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H +++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H @@ -29,7 +29,7 @@ License const dictionary& pimpleDict = pimple.dict(); // Maximum flow Courant number - scalar maxCo(readScalar(pimpleDict.lookup("maxCo"))); + scalar maxCo(pimpleDict.get("maxCo")); // Maximum time scale scalar maxDeltaT(pimpleDict.lookupOrDefault("maxDeltaT", GREAT)); @@ -118,7 +118,7 @@ License if (Yref.found(Yi.name())) { foundY = true; - scalar Yrefi = readScalar(Yref.lookup(Yi.name())); + const scalar Yrefi = Yref.get(Yi.name()); rDeltaTY.field() = max ( diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C index 0590e8d098..4e12e668e2 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C @@ -84,7 +84,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField rhoName_(dict.lookupOrDefault("rho", "rho")), psiName_(dict.lookupOrDefault("psi", "thermo:psi")), muName_(dict.lookupOrDefault("mu", "thermo:mu")), - accommodationCoeff_(readScalar(dict.lookup("accommodationCoeff"))), + accommodationCoeff_(dict.get("accommodationCoeff")), Twall_("Twall", dict, p.size()), gamma_(dict.lookupOrDefault("gamma", 1.4)) { diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C index defbf3fe22..aa6e13648b 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C @@ -85,7 +85,7 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField psiName_(dict.lookupOrDefault("psi", "thermo:psi")), muName_(dict.lookupOrDefault("mu", "thermo:mu")), tauMCName_(dict.lookupOrDefault("tauMC", "tauMC")), - accommodationCoeff_(readScalar(dict.lookup("accommodationCoeff"))), + accommodationCoeff_(dict.get("accommodationCoeff")), Uwall_("Uwall", dict, p.size()), thermalCreep_(dict.lookupOrDefault("thermalCreep", true)), curvature_(dict.lookupOrDefault("curvature", true)) diff --git a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H index a3bd66654d..e15261990a 100644 --- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H +++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H @@ -25,8 +25,8 @@ if (!local) { - const scalar T0 = readScalar(eosDict.lookup("T0")); - const scalar p0 = readScalar(eosDict.lookup("p0")); + const scalar T0 = eosDict.get("T0"); + const scalar p0 = eosDict.get("p0"); he = thermo.he(p, pow(p/p0, (gamma - scalar(1))/gamma)*T0); } diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H index 3f43981907..8c9a222f16 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H +++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H @@ -12,7 +12,7 @@ IOdictionary mdEquilibrationDict ) ); -scalar targetTemperature = readScalar +scalar targetTemperature ( - mdEquilibrationDict.lookup("targetTemperature") + mdEquilibrationDict.get("targetTemperature") ); diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H index ea19bf758c..55c3608ac9 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -139,10 +139,9 @@ basicKinematicTypeCloud kinematicCloud scalar alphacMin ( 1.0 - - readScalar - ( + - ( kinematicCloud.particleProperties().subDict("constantProperties") - .lookup("alphaMax") + .get("alphaMax") ) ); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H index 3b2d3a77cf..00664ea0c6 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H @@ -29,7 +29,7 @@ License const dictionary& pimpleDict = pimple.dict(); // Maximum flow Courant number - scalar maxCo(readScalar(pimpleDict.lookup("maxCo"))); + scalar maxCo(pimpleDict.get("maxCo")); // Maximum time scale scalar maxDeltaT(pimpleDict.lookupOrDefault("maxDeltaT", GREAT)); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H index 1a57519eac..c9deaa4e0e 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H @@ -29,7 +29,7 @@ License const dictionary& pimpleDict = pimple.dict(); // Maximum flow Courant number - scalar maxCo(readScalar(pimpleDict.lookup("maxCo"))); + scalar maxCo(pimpleDict.get("maxCo")); // Maximum time scale scalar maxDeltaT(pimpleDict.lookupOrDefault("maxDeltaT", GREAT)); diff --git a/applications/solvers/multiphase/MPPICInterFoam/createFields.H b/applications/solvers/multiphase/MPPICInterFoam/createFields.H index 95746f2f6d..61f4def128 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/createFields.H +++ b/applications/solvers/multiphase/MPPICInterFoam/createFields.H @@ -160,10 +160,9 @@ basicKinematicMPPICCloud kinematicCloud scalar alphacMin ( 1.0 - - readScalar - ( + - ( kinematicCloud.particleProperties().subDict("constantProperties") - .lookup("alphaMax") + .get("alphaMax") ) ); diff --git a/applications/solvers/multiphase/VoF/alphaCourantNo.H b/applications/solvers/multiphase/VoF/alphaCourantNo.H index 24f6e48a22..d67638a3c2 100644 --- a/applications/solvers/multiphase/VoF/alphaCourantNo.H +++ b/applications/solvers/multiphase/VoF/alphaCourantNo.H @@ -31,7 +31,7 @@ Description scalar maxAlphaCo ( - readScalar(runTime.controlDict().lookup("maxAlphaCo")) + runTime.controlDict().get("maxAlphaCo") ); scalar alphaCoNum = 0.0; diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H index d47cf78b5a..70acf5b5ee 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H @@ -2,5 +2,5 @@ scalar maxAcousticCo ( - readScalar(runTime.controlDict().lookup("maxAcousticCo")) + runTime.controlDict().get("maxAcousticCo") ); diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H index 51a2da33bd..f5b1d8ef01 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H @@ -70,10 +70,10 @@ // Remove the swirl component of velocity for "wedge" cases if (pimple.dict().found("removeSwirl")) { - label swirlCmpt(readLabel(pimple.dict().lookup("removeSwirl"))); + label swirlCmpt(pimple.dict().get